From 82f81f713a816be89017f59e1a7841343c7716eb Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Fri, 23 Oct 2020 16:04:41 +0300
Subject: [PATCH] qt: Fix main window geometry save/restore

---
 src/qt/bitcoingui.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 0c2dcc3584e..3bcd7c0ba42 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -82,10 +82,10 @@ BitcoinGUI::BitcoinGUI(interfaces::Node& node, const PlatformStyle *_platformSty
     m_network_style(networkStyle)
 {
     QSettings settings;
-    if (!restoreGeometry(settings.value("MainWindowGeometry").toByteArray())) {
-        // Restore failed (perhaps missing setting), center the window
-        move(QGuiApplication::primaryScreen()->availableGeometry().center() - frameGeometry().center());
-    }
+    settings.beginGroup("MainWindow");
+    resize(settings.value("size", QSize(800, 540)).toSize());
+    move(settings.value("pos", QGuiApplication::primaryScreen()->availableGeometry().center() - frameGeometry().center()).toPoint());
+    settings.endGroup();
 
 #ifdef ENABLE_WALLET
     enableWallet = WalletModel::isWalletEnabled();
@@ -224,7 +224,11 @@ BitcoinGUI::~BitcoinGUI()
     unsubscribeFromCoreSignals();
 
     QSettings settings;
-    settings.setValue("MainWindowGeometry", saveGeometry());
+    settings.beginGroup("MainWindow");
+    settings.setValue("size", size());
+    settings.setValue("pos", pos());
+    settings.endGroup();
+
     if(trayIcon) // Hide tray icon, as deleting will let it linger until quit (on Ubuntu)
         trayIcon->hide();
 #ifdef Q_OS_MAC