diff options
| author | Wladimir J. van der Laan <[email protected]> | 2012-02-20 08:56:41 -0800 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2012-02-20 08:56:41 -0800 |
| commit | f7b8f824de1f5d4671d2ba2ee4b823df00b4e0f6 (patch) | |
| tree | eb37fd644d899999c4a45205834ab9f3e548f017 /src/qt/bitcoin.cpp | |
| parent | Merge pull request #858 from laanwj/2012_02_uisendlabelfix (diff) | |
| parent | On windows, show message box with help, as there is no stderr (fixes #702) (diff) | |
| download | discoin-f7b8f824de1f5d4671d2ba2ee4b823df00b4e0f6.tar.xz discoin-f7b8f824de1f5d4671d2ba2ee4b823df00b4e0f6.zip | |
Merge pull request #857 from laanwj/2012_02_fixhelpwindow
On windows, show message box with help, as there is no stderr (fixes #702)
Diffstat (limited to 'src/qt/bitcoin.cpp')
| -rw-r--r-- | src/qt/bitcoin.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 20c185ed2..354e87c98 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -27,18 +27,10 @@ QSplashScreen *splashref; int MyMessageBox(const std::string& message, const std::string& caption, int style, wxWindow* parent, int x, int y) { - // Message from main thread - if(guiref) - { - guiref->error(QString::fromStdString(caption), - QString::fromStdString(message)); - } - else - { - QMessageBox::critical(0, QString::fromStdString(caption), - QString::fromStdString(message), - QMessageBox::Ok, QMessageBox::Ok); - } + // Message from AppInit2(), always in main thread before main window is constructed + QMessageBox::critical(0, QString::fromStdString(caption), + QString::fromStdString(message), + QMessageBox::Ok, QMessageBox::Ok); return 4; } |