Use MainWindow instead of QApplication::activeWindow to reference the…

… main window The latter will not always return a valid pointer. fixes #363
mujx · Jul 15, 2018 · fde066e · fde066e
1 parent 31d09db
commit fde066e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/CommunitiesList.cc b/src/CommunitiesList.cc
@@ -1,5 +1,5 @@
-#include "Cache.h"
 #include "CommunitiesList.h"
+#include "Cache.h"
 #include "Logging.hpp"
 #include "MatrixClient.h"
 

diff --git a/src/dialogs/PreviewUploadOverlay.cc b/src/dialogs/PreviewUploadOverlay.cc
@@ -25,6 +25,7 @@
 
 #include "Config.h"
 #include "Logging.hpp"
+#include "MainWindow.h"
 #include "Utils.h"
 
 #include "dialogs/PreviewUploadOverlay.h"
@@ -61,9 +62,16 @@ PreviewUploadOverlay::PreviewUploadOverlay(QWidget *parent)
 void
 PreviewUploadOverlay::init()
 {
-        auto window  = QApplication::activeWindow();
-        auto winsize = window->frameGeometry().size();
-        auto center  = window->frameGeometry().center();
+        QSize winsize;
+        QPoint center;
+
+        auto window = MainWindow::instance();
+        if (window) {
+                winsize = window->frameGeometry().size();
+                center  = window->frameGeometry().center();
+        } else {
+                nhlog::ui()->warn("unable to load the retrieve MainWindow's size");
+        }
 
         fileName_.setText(QFileInfo{filePath_}.fileName());