Merging upstream version 4.2.5.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 6 insertions, 0 deletions

diff --git a/ui/qt/export_dissection_dialog.cpp b/ui/qt/export_dissection_dialog.cpp
index 7f2664e..5b09efc 100644
--- a/ui/qt/export_dissection_dialog.cpp
+++ b/ui/qt/export_dissection_dialog.cpp
@@ -172,6 +172,12 @@ void ExportDissectionDialog::show()
 void ExportDissectionDialog::dialogAccepted(const QStringList &selected)
 {
     if (selected.length() > 0) {
+        /* writing might take a while, so hide ourselves so the user
+         * can't click on anything here (this dialog will be closed
+         * and deleted once this function is done), but can access
+         * the ProgressDialog in the main window to cancel the export.
+         */
+        hide();
         cf_print_status_t status;
         QString file_name = selected[0];