Fix a weird bug that started appearing in Qt5.3

The menu geometry would be overwritten for unknown reason.

diff --git a/player/mainwindow.cpp b/player/mainwindow.cpp
index 065833d45edc775b19f70bdcad71aeb1d79d354b..531b886280212c0c0b75d625602deff283087ee8 100644 (file)
--- a/player/mainwindow.cpp
+++ b/player/mainwindow.cpp
@@ -506,12 +506,6 @@ void MainWindow::saveSettings()
 void MainWindow::loadSettings()
 {
        QSettings settings;
-       settings.beginGroup("settings");
-               open(settings.value("currentFile", "").toString());
-               player->setVolume(settings.value("volume", qreal(1.0)).toDouble());
-               player->setMuted(settings.value("muted", false).toBool());
-               m_opSkip = settings.value("opSkip", 85).toInt();
-       settings.endGroup();
        settings.beginGroup("videoWindow");
                restoreGeometry(settings.value("geometry", saveGeometry()).toByteArray());
                m_actions["toggleStayOnTop"]->setChecked(settings.value("stayOnTop", false).toBool());
@@ -525,4 +519,13 @@ void MainWindow::loadSettings()
        settings.beginGroup("anidbudpapiclient");
                player->setAutomark(settings.value("automark", 0).toInt());
        settings.endGroup();
+       settings.beginGroup("settings");
+               // open needs to happen after all geometry settings have been read.
+               // open may create native windows and set the default sizes if the geometries haven't been set
+               // TODO: figure out why the reverse gets discarded? Multiple resize events?
+               open(settings.value("currentFile", "").toString());
+               player->setVolume(settings.value("volume", qreal(1.0)).toDouble());
+               player->setMuted(settings.value("muted", false).toBool());
+               m_opSkip = settings.value("opSkip", 85).toInt();
+       settings.endGroup();
 }