From: APTX <APTX@.(none)>
Date: Wed, 13 May 2009 14:51:07 +0000 (+0200)
Subject: - Restore menu state before geometry
X-Git-Url: https://gitweb.tyo.aptx.org/?a=commitdiff_plain;h=4a0f20cb9b080ca75b17b6e3d9737641c04bb2b4;p=aniplayer-old.git

- Restore menu state before geometry
- Code formatting++
---

diff --git a/src/menu.cpp b/src/menu.cpp
index d07cd02..cdf9fc7 100644
--- a/src/menu.cpp
+++ b/src/menu.cpp
@@ -113,9 +113,9 @@ void Menu::tick(qint64 pos)
 
 void Menu::setTotalTime(qint64 pos)
 {
-	int sec = pos/1000;
-	int min = sec/60;
-	int hour = min/60;
+	int sec = pos / 1000;
+	int min = sec / 60;
+	int hour = min / 60;
 	int msec = pos;
 	totalTime = " / " + QTime(hour, min % 60, sec % 60, msec % 1000).toString("h:mm:ss");
 }
diff --git a/src/videowindow.cpp b/src/videowindow.cpp
index 38a171e..2d54388 100644
--- a/src/videowindow.cpp
+++ b/src/videowindow.cpp
@@ -750,8 +750,8 @@ void VideoWindow::loadSettings()
 		restoreGeometry(settings.value("geometry", saveGeometry()).toByteArray());
 	settings.endGroup();
 	settings.beginGroup("menu");
-		menu->restoreGeometry(settings.value("geometry", menu->saveGeometry()).toByteArray());
 		menu->restoreState(settings.value("state", menu->saveState()).toByteArray());
+		menu->restoreGeometry(settings.value("geometry", menu->saveGeometry()).toByteArray());
 		menu->setVisible(settings.value("isVisible", true).toBool());
 	settings.endGroup();
 #  ifndef NO_ANIDBUDPCLIENT