Merge pull request #1106 from ctrlaltca/fix_1105

Fix crash on server shutdown; fix #1105

cockatrice/src/window_main.cpp

@@ -86,13 +86,11 @@ void MainWindow::processConnectionClosedEvent(const Event_ConnectionClosed &even
 
 void MainWindow::processServerShutdownEvent(const Event_ServerShutdown &event)
 {
-    if (serverShutdownMessageBox)
-        serverShutdownMessageBox->close();
-    serverShutdownMessageBox = new QMessageBox(this);
-    serverShutdownMessageBox->setAttribute(Qt::WA_DeleteOnClose);
-    serverShutdownMessageBox->setInformativeText(tr("The server is going to be restarted in %n minute(s).\nAll running games will be lost.\nReason for shutdown: %1", "", event.minutes()).arg(QString::fromStdString(event.reason())));
-    serverShutdownMessageBox->setText(tr("Scheduled server shutdown"));
-    serverShutdownMessageBox->exec();
+    serverShutdownMessageBox.setInformativeText(tr("The server is going to be restarted in %n minute(s).\nAll running games will be lost.\nReason for shutdown: %1", "", event.minutes()).arg(QString::fromStdString(event.reason())));
+    serverShutdownMessageBox.setIconPixmap(QPixmap(":/resources/appicon.svg").scaled(64, 64));
+    serverShutdownMessageBox.setText(tr("Scheduled server shutdown"));
+    serverShutdownMessageBox.setWindowModality(Qt::ApplicationModal);
+    serverShutdownMessageBox.setVisible(true);
 }
 
 void MainWindow::statusChanged(ClientStatus _status)
@@ -436,8 +434,6 @@ MainWindow::MainWindow(QWidget *parent)
         createTrayActions();
         createTrayIcon();
     }
-
-    serverShutdownMessageBox = 0;
 }
 
 MainWindow::~MainWindow()

cockatrice/src/window_main.h

@@ -23,6 +23,7 @@
 #include <QMainWindow>
 #include <QSystemTrayIcon>
 #include <QProcess>
+#include <QMessageBox>
 #include "abstractclient.h"
 #include "pb/response.pb.h"
 
@@ -32,7 +33,6 @@ class LocalClient;
 class LocalServer;
 class ServerInfo_User;
 class QThread;
-class QMessageBox;
 
 class MainWindow : public QMainWindow {
     Q_OBJECT
@@ -95,7 +95,7 @@ private:
     LocalServer *localServer;
     bool bHasActivated;
 
-    QMessageBox *serverShutdownMessageBox;
+    QMessageBox serverShutdownMessageBox;
     QProcess * cardUpdateProcess;
 public:
     MainWindow(QWidget *parent = 0);