osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Qt: Keep dialogs from blocking tests. 

If WIRESHARK_QUIT_AFTER_CAPTURE is set, call exit(0). This keeps us from
emitting the aboutToQuit signal and doing things that might pop up
dialogs.

Change-Id: I6e986b6e7ad824d8b5258e34a12c32869f5b2d34
Reviewed-on: https://code.wireshark.org/review/4421
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2014-10-02 09:28:28 -07:00
parent abfa0911f7
commit c0cdf9473a
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ui/qt/main_window_slots.cpp
View File

@ -420,9 +420,9 @@ void MainWindow::captureCaptureUpdateFinished(capture_session *cap_session) {
setWindowIcon(wsApp->normalIcon());
if (global_capture_opts.quit_after_cap) {
/* command line asked us to quit after the capture */
/* don't pop up a dialog to ask for unsaved files etc. */
wsApp->quit();
// Command line asked us to quit after capturing.
// Don't pop up a dialog to ask for unsaved files etc.
exit(0);
}
#endif // HAVE_LIBPCAP
}
@ -445,9 +445,9 @@ void MainWindow::captureCaptureFixedFinished(capture_session *cap_session) {
setWindowIcon(wsApp->normalIcon());
if (global_capture_opts.quit_after_cap) {
/* command line asked us to quit after the capture */
/* don't pop up a dialog to ask for unsaved files etc. */
wsApp->quit();
// Command line asked us to quit after capturing.
// Don't pop up a dialog to ask for unsaved files etc.
exit(0);
}
#endif // HAVE_LIBPCAP
}
@ -471,9 +471,9 @@ void MainWindow::captureCaptureFailed(capture_session *cap_session) {
setWindowIcon(wsApp->normalIcon());
if (global_capture_opts.quit_after_cap) {
/* command line asked us to quit after the capture */
/* don't pop up a dialog to ask for unsaved files etc. */
wsApp->quit();
// Command line asked us to quit after capturing.
// Don't pop up a dialog to ask for unsaved files etc.
exit(0);
}
#endif // HAVE_LIBPCAP
}

3
ui/qt/wireshark_application.cpp
View File

@ -533,8 +533,7 @@ void WiresharkApplication::clearRecentItems() {
void WiresharkApplication::cleanup()
{
software_update_cleanup();
/* write user's recent file to disk
* It is no problem to write this file, even if we do not quit */
// Write the user's recent file(s) to disk.
write_profile_recent();
write_recent();
}