mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 12:02:48 +01:00
Merge pull request #3427
1ad2636
qt: Prevent non-functional GUI from popping up during Init (Wladimir J. van der Laan)
This commit is contained in:
commit
362755d018
@ -164,13 +164,13 @@ void HandleSIGHUP(int)
|
||||
|
||||
bool static InitError(const std::string &str)
|
||||
{
|
||||
uiInterface.ThreadSafeMessageBox(str, "", CClientUIInterface::MSG_ERROR);
|
||||
uiInterface.ThreadSafeMessageBox(str, "", CClientUIInterface::MSG_ERROR | CClientUIInterface::NOSHOWGUI);
|
||||
return false;
|
||||
}
|
||||
|
||||
bool static InitWarning(const std::string &str)
|
||||
{
|
||||
uiInterface.ThreadSafeMessageBox(str, "", CClientUIInterface::MSG_WARNING);
|
||||
uiInterface.ThreadSafeMessageBox(str, "", CClientUIInterface::MSG_WARNING | CClientUIInterface::NOSHOWGUI);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -684,8 +684,11 @@ void BitcoinGUI::message(const QString &title, const QString &message, unsigned
|
||||
if (!(buttons = (QMessageBox::StandardButton)(style & CClientUIInterface::BTN_MASK)))
|
||||
buttons = QMessageBox::Ok;
|
||||
|
||||
// Ensure we get users attention
|
||||
showNormalIfMinimized();
|
||||
// Ensure we get users attention, but only if main window is visible
|
||||
// as we don't want to pop up the main window for messages that happen before
|
||||
// initialization is finished.
|
||||
if(!(style & CClientUIInterface::NOSHOWGUI))
|
||||
showNormalIfMinimized();
|
||||
QMessageBox mBox((QMessageBox::Icon)nMBoxIcon, strTitle, message, buttons, this);
|
||||
int r = mBox.exec();
|
||||
if (ret != NULL)
|
||||
|
@ -62,6 +62,8 @@ public:
|
||||
|
||||
/** Force blocking, modal message box dialog (not just OS notification) */
|
||||
MODAL = 0x10000000U,
|
||||
/** Don't bring GUI to foreground. Use for messages during initialization */
|
||||
NOSHOWGUI = 0x20000000U,
|
||||
|
||||
/** Predefined combinations for certain default usage cases */
|
||||
MSG_INFORMATION = ICON_INFORMATION,
|
||||
|
Loading…
Reference in New Issue
Block a user