aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt/simple_dialog.cpp
diff options
context:
space:
mode:
authorGerald Combs <gerald@zing.org>2014-12-14 09:49:02 -0800
committerGerald Combs <gerald@wireshark.org>2014-12-14 17:53:22 +0000
commit44e14b780560fda8b8b5a8a2d3544224a6ae6806 (patch)
tree23fa07beded3a519d456d439fc5572d9c7e17ac3 /ui/qt/simple_dialog.cpp
parent85ed008287af8ebce0402c2a8b92f58f414147f6 (diff)
Qt: Defer startup messages.
Wait until we've completely started up to show accumulated warnings and errors. Replace three periods with an ellipsis. Change-Id: Ic3b268836e4e4429786c5eba4862cbc0458a19b5 Reviewed-on: https://code.wireshark.org/review/5762 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/simple_dialog.cpp')
-rw-r--r--ui/qt/simple_dialog.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/qt/simple_dialog.cpp b/ui/qt/simple_dialog.cpp
index 2c04b86dd6..2406178377 100644
--- a/ui/qt/simple_dialog.cpp
+++ b/ui/qt/simple_dialog.cpp
@@ -26,6 +26,7 @@
#include "ui/utf8_entities.h"
#include "qt_ui_utils.h"
+#include "wireshark_application.h"
#include <QMessageBox>
#include <QTextCodec>
@@ -111,11 +112,12 @@ SimpleDialog::SimpleDialog(QWidget *parent, ESD_TYPE_E type, int btn_mask, const
return;
}
- if (!parent) {
+ if (!parent || !wsApp->isInitialized()) {
message_queue_ << msg_pair;
if (type > max_severity_) {
max_severity_ = type;
}
+ setText(QString());
return;
}
@@ -222,7 +224,7 @@ void SimpleDialog::displayQueuedMessages(QWidget *parent)
int SimpleDialog::exec()
{
- if (!parentWidget()) {
+ if (!parentWidget() || text().isEmpty()) {
return 0;
}