diff options
Diffstat (limited to 'ui/qt/simple_dialog.cpp')
| -rw-r--r-- | ui/qt/simple_dialog.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ui/qt/simple_dialog.cpp b/ui/qt/simple_dialog.cpp index 8996aebee1..2288751df2 100644 --- a/ui/qt/simple_dialog.cpp +++ b/ui/qt/simple_dialog.cpp @@ -104,7 +104,7 @@ SimpleDialog::SimpleDialog(QWidget *parent, ESD_TYPE_E type, int btn_mask, const return; } - if (!parent || !wsApp->isInitialized()) { + if (!parent || !wsApp->isInitialized() || wsApp->isReloadingLua()) { message_queue_ << msg_pair; if (type > max_severity_) { max_severity_ = type; @@ -168,7 +168,11 @@ void SimpleDialog::displayQueuedMessages(QWidget *parent) return; } - QMessageBox mb(parent); + // Use last parent if not set + static QWidget *parent_w = NULL; + if (parent) parent_w = parent; + + QMessageBox mb(parent_w); switch(max_severity_) { case ESD_TYPE_ERROR: |