80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

handle early ui_msgbox_header() calls before main_window has been created

Browse Source
This commit is contained in:
Joakim L. Gilje
2021-12-08 14:47:09 +01:00
parent 018453164e
commit 5bc00b220f
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/qt/qt_ui.cpp
View File

@@ -2,6 +2,7 @@
#include <QDebug> #include <QDebug>
#include <QThread> #include <QThread>
#include <QMessageBox>
#include <QStatusBar> #include <QStatusBar>
@@ -60,7 +61,13 @@ int ui_msgbox_header(int flags, void *header, void* message) {
auto hdr = QString::fromWCharArray(reinterpret_cast<const wchar_t*>(header)); auto hdr = QString::fromWCharArray(reinterpret_cast<const wchar_t*>(header));
auto msg = QString::fromWCharArray(reinterpret_cast<const wchar_t*>(message)); auto msg = QString::fromWCharArray(reinterpret_cast<const wchar_t*>(message));
main_window->showMessage(hdr, msg); // any error in early init
if (main_window == nullptr) {
QMessageBox::critical(nullptr, hdr, msg);
} else {
// else scope it to main_window
main_window->showMessage(hdr, msg);
}
return 0; return 0;
} }