From 289ea31f8cf43e11921e525e87323158f831796c Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Wed, 28 Nov 2018 21:08:23 +0100
Subject: [PATCH] Fix saving geometry and fancytab settings (#6217)

---
 src/ui/mainwindow.cpp | 17 ++++++++++++++++-
 src/ui/mainwindow.h   |  4 +++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index e4b2bb31e..dfdfa1669 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -221,6 +221,7 @@ MainWindow::MainWindow(Application* app, SystemTrayIcon* tray_icon, OSD* osd,
       library_sort_model_(new QSortFilterProxyModel(this)),
       track_position_timer_(new QTimer(this)),
       track_slider_timer_(new QTimer(this)),
+      initialized_(false),
       saved_playback_position_(0),
       saved_playback_state_(Engine::Empty),
       doubleclick_addmode_(AddBehaviour_Append),
@@ -1066,6 +1067,9 @@ MainWindow::MainWindow(Application* app, SystemTrayIcon* tray_icon, OSD* osd,
 
   if (!options.contains_play_options()) LoadPlaybackStatus();
 
+  initialized_ = true;
+  SaveGeometry();
+
   qLog(Debug) << "Started";
 }
 
@@ -1278,9 +1282,19 @@ void MainWindow::ScrobbleButtonVisibilityChanged(bool value) {
   }
 }
 
-void MainWindow::resizeEvent(QResizeEvent*) { SaveGeometry(); }
+void MainWindow::changeEvent(QEvent*) {
+  if (!initialized_) return;
+  SaveGeometry();
+}
+
+void MainWindow::resizeEvent(QResizeEvent*) {
+  if (!initialized_) return;
+  SaveGeometry();
+}
 
 void MainWindow::SaveGeometry() {
+  if (!initialized_) return;
+
   was_maximized_ = isMaximized();
   settings_.setValue("maximized", was_maximized_);
   // Save the geometry only when mainwindow is not in maximized state
@@ -2790,6 +2804,7 @@ bool MainWindow::winEvent(MSG* msg, long*) {
 #endif  // Q_OS_WIN32
 
 void MainWindow::Exit() {
+  SaveGeometry();
   SavePlaybackStatus();
   settings_.setValue("show_sidebar",
                      ui_->action_toggle_show_sidebar->isChecked());
diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h
index 86f07aad9..c007f311c 100644
--- a/src/ui/mainwindow.h
+++ b/src/ui/mainwindow.h
@@ -131,7 +131,8 @@ class MainWindow : public QMainWindow, public PlatformInterface {
 
  protected:
   void keyPressEvent(QKeyEvent* event);
-  void resizeEvent(QResizeEvent* event);
+  void changeEvent(QEvent*);
+  void resizeEvent(QResizeEvent*);
   void closeEvent(QCloseEvent* event);
 
 #ifdef Q_OS_WIN32
@@ -378,6 +379,7 @@ signals:
   QTimer* track_slider_timer_;
   QSettings settings_;
 
+  bool initialized_;
   bool was_maximized_;
   int saved_playback_position_;
   Engine::State saved_playback_state_;