- Restore menu state before geometry

- Code formatting++

diff --git a/src/menu.cpp b/src/menu.cpp
index d07cd0209cf3dc59904a19a57c3cf1ae637167ab..cdf9fc7260ee1a6d99dc917bd98d4da6ab9ab75e 100644 (file)
--- 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 38a171e9144c3f365f0d6e6a06d95effdaa105ab..2d54388cfdfc30ee30f63ba1adc4f8d28a488c03 100644 (file)
--- 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