From: APTX <marek321@gmail.com>
Date: Sat, 16 Aug 2014 11:06:52 +0000 (+0200)
Subject: Fix a weird bug that started appearing in Qt5.3
X-Git-Url: https://gitweb.tyo.aptx.org/?a=commitdiff_plain;h=e5cdbac8d47ae6d30f11a99e52fb1a0a4e721758;p=aniplayer2.git

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 065833d..531b886 100644
--- 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();
 }