diff options
author | Gerald Combs <gerald@wireshark.org> | 2016-10-17 11:55:56 +0200 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2016-10-17 12:20:16 +0000 |
commit | fbc816a998c1649beaeefd743846c4ce977ac2b2 (patch) | |
tree | b0e11b793bb62f93de2eedde25c8b9f2f83597c4 /wireshark-qt.cpp | |
parent | 1d094209e8d6384cdb9fb6f88fc95a52a5ab45ae (diff) |
Qt: Read our dynamic recent entries a bit earlier.
Call recent_read_dynamic a bit earlier in the startup process. Note that
it determines when we fill in the recent files list, so the earlier we
call it the better.
Change-Id: Iad37d3aa2222873259d6c96ba79672236c8e4cd5
Reviewed-on: https://code.wireshark.org/review/18235
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'wireshark-qt.cpp')
-rw-r--r-- | wireshark-qt.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp index 8a9089b362..d5f17c045f 100644 --- a/wireshark-qt.cpp +++ b/wireshark-qt.cpp @@ -563,6 +563,16 @@ int main(int argc, char *qt_argv[]) return 2; } + // Read the dynamic part of the recent file. This determines whether or + // not the recent list appears in the main window so the earlier we can + // call this the better. + if (!recent_read_dynamic(&rf_path, &rf_open_errno)) { + simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK, + "Could not open recent file\n\"%s\": %s.", + rf_path, g_strerror(rf_open_errno)); + g_free(rf_path); + } + splash_update(RA_LISTENERS, NULL, NULL); /* Register all tap listeners; we do this before we parse the arguments, @@ -737,15 +747,6 @@ int main(int argc, char *qt_argv[]) main_w->setWSWindowTitle(); //////// - /* Read the dynamic part of the recent file, as we have the gui now ready for - it. */ - if (!recent_read_dynamic(&rf_path, &rf_open_errno)) { - simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK, - "Could not open recent file\n\"%s\": %s.", - rf_path, g_strerror(rf_open_errno)); - g_free(rf_path); - } - packet_list_enable_color(recent.packet_list_colorize); g_log(NULL, G_LOG_LEVEL_DEBUG, "FIX: fetch recent color settings"); |