2 files changed, 19 insertions, 1 deletions
diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp
index c742bbaf6f..30f3d37a32 100644
--- a/ui/qt/main.cpp
+++ b/ui/qt/main.cpp
@@ -298,7 +298,7 @@ print_usage(gboolean for_help_option) {
 #ifndef _WIN32
     fprintf(output, "  --display=DISPLAY        X display to use\n");
 #endif
-    fprintf(output, "\nNOTE: Not all options are already implemented in the QT port.\n");
+    fprintf(output, "\nNOTE: Not all options are implemented in the Qt port.\n");
 
 #ifdef _WIN32
     destroy_console();
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index e1b47791f9..b1951028aa 100644
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -418,6 +418,12 @@ void MainWindow::captureCaptureUpdateFinished(capture_session *cap_session) {
     setForCaptureInProgress(false);
 
     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();
+    }
 #endif // HAVE_LIBPCAP
 }
 void MainWindow::captureCaptureFixedStarted(capture_session *cap_session) {
@@ -437,6 +443,12 @@ void MainWindow::captureCaptureFixedFinished(capture_session *cap_session) {
     setForCaptureInProgress(false);
 
     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();
+    }
 #endif // HAVE_LIBPCAP
 }
 void MainWindow::captureCaptureStopping(capture_session *cap_session) {
@@ -457,6 +469,12 @@ void MainWindow::captureCaptureFailed(capture_session *cap_session) {
     main_ui_->mainStack->setCurrentWidget(main_welcome_);
 
     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();
+    }
 #endif // HAVE_LIBPCAP
 }