--- a/QTfrontend/util/MessageDialog.cpp Tue Nov 10 18:16:35 2015 +0100
+++ b/QTfrontend/util/MessageDialog.cpp Tue Nov 10 20:43:13 2015 +0100
@@ -1,6 +1,6 @@
/*
* Hedgewars, a free turn based strategy game
- * Copyright (c) 2004-2013 Andrey Korotaev <unC0Rr@gmail.com>
+ * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -13,12 +13,14 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "MessageDialog.h"
#include "HWApplication.h"
+
+
int MessageDialog::ShowFatalMessage(const QString & msg, QWidget * parent)
{
return ShowMessage(QMessageBox::tr("Hedgewars - Error"),
@@ -45,7 +47,22 @@
int MessageDialog::ShowMessage(const QString & title, const QString & msg, QMessageBox::Icon icon, QWidget * parent)
{
- QMessageBox msgMsg(parent ? parent : HWApplication::activeWindow());
+ // if no parent try to use active window
+ parent = parent ? parent : HWApplication::activeWindow();
+
+ // didn't work? make child of hwform (e.g. for style and because modal)
+ if (!parent)
+ {
+ try
+ {
+ HWApplication * app = dynamic_cast<HWApplication*>(HWApplication::instance());
+ if (app->form)
+ parent = app->form;
+ }
+ catch (...) { /* nothing */ }
+ }
+
+ QMessageBox msgMsg(parent);
msgMsg.setWindowTitle(title != NULL ? title : "Hedgewars");
msgMsg.setText(msg);
msgMsg.setIcon(icon);