diff options
| author | Denys Vlasenko <dvlasenk@redhat.com> | 2011-05-11 15:21:57 +0200 |
|---|---|---|
| committer | Denys Vlasenko <dvlasenk@redhat.com> | 2011-05-11 15:21:57 +0200 |
| commit | 5f05e82e179275da7b0c29fbba4ab42e32035a9d (patch) | |
| tree | acfde0fd2b490d5553e9f878b9a5b199ced4f46e | |
| parent | a87c0a22479a5ff4bfdf8c8e92857350628807c3 (diff) | |
| download | abrt-5f05e82e179275da7b0c29fbba4ab42e32035a9d.tar.gz abrt-5f05e82e179275da7b0c29fbba4ab42e32035a9d.tar.xz abrt-5f05e82e179275da7b0c29fbba4ab42e32035a9d.zip | |
wizard: fix navigation but when "go to reporting step" leads to empty page
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
| -rw-r--r-- | src/gui-wizard-gtk/wizard.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/gui-wizard-gtk/wizard.c b/src/gui-wizard-gtk/wizard.c index ba001f40..23d9141d 100644 --- a/src/gui-wizard-gtk/wizard.c +++ b/src/gui-wizard-gtk/wizard.c @@ -541,7 +541,7 @@ static event_gui_data_t *add_event_buttons(GtkBox *box, event_gui_data_t *event_gui_data = new_event_gui_data_t(); event_gui_data->event_name = xstrdup(event_name); event_gui_data->toggle_button = GTK_TOGGLE_BUTTON(button); - *p_event_list = g_list_append(*p_event_list, event_gui_data); + *p_event_list = g_list_append(*p_event_list, event_gui_data); if (!first_button) first_button = event_gui_data; @@ -1230,6 +1230,8 @@ static gint select_next_page_no(gint current_page_no, gpointer data) if (g_report_only) return current_page_no + 1; + gint prev_page_no = current_page_no; + again: current_page_no++; @@ -1259,16 +1261,20 @@ static gint select_next_page_no(gint current_page_no, gpointer data) case PAGENO_ANALYZE_PROGRESS: VERB2 log("%s: ANALYZE_PROGRESS: g_analyze_event_selected:'%s'", __func__, g_analyze_event_selected); - if (!g_analyze_event_selected || !g_analyze_event_selected[0]) + if (!g_analyze_event_selected || !g_analyze_event_selected[0]) goto again; /* skip this page */ break; case PAGENO_REPORTER_SELECTOR: VERB2 log("%s: REPORTER_SELECTOR: g_black_event_count:%d", __func__, g_black_event_count); - if (g_black_event_count != 0) - { - /* Still have analyzers which didn't run? Go back */ + /* if we _did_ run an event (didn't skip it) + * and still have analyzers which didn't run + */ + if (prev_page_no == PAGENO_ANALYZE_PROGRESS + && g_black_event_count != 0 + ) { + /* Go back to analyzer selectors */ current_page_no = PAGENO_ANALYZE_SELECTOR-1; goto again; } |