From 63fd931245013faa9a3ffc0dfe7c1e63747218b3 Mon Sep 17 00:00:00 2001 From: spycrab Date: Mon, 11 Mar 2019 18:20:13 +0100 Subject: [PATCH] ModalMessageBox: Remove superfluous buttons and ensure correct parent --- Source/Core/DolphinQt/QtUtils/ModalMessageBox.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/Core/DolphinQt/QtUtils/ModalMessageBox.cpp b/Source/Core/DolphinQt/QtUtils/ModalMessageBox.cpp index 8cc23b613b..a6b06bdf09 100644 --- a/Source/Core/DolphinQt/QtUtils/ModalMessageBox.cpp +++ b/Source/Core/DolphinQt/QtUtils/ModalMessageBox.cpp @@ -6,13 +6,14 @@ #include -ModalMessageBox::ModalMessageBox(QWidget* parent) : QMessageBox(parent) +ModalMessageBox::ModalMessageBox(QWidget* parent) + : QMessageBox(parent != nullptr ? parent->window() : nullptr) { setWindowModality(Qt::WindowModal); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + setWindowFlags(Qt::Sheet | Qt::WindowTitleHint | Qt::CustomizeWindowHint); // No parent is still preferable to showing a hidden parent here. - if (parent != nullptr && !parent->isVisible()) + if (parent != nullptr && !parent->window()->isVisible()) setParent(nullptr); }