From 2795dc56950c4c9733c2ce67bf94271d537d2ec4 Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Tue, 29 Nov 2022 03:10:00 +0200
Subject: [PATCH] kmediaplayer: save the current menu and status bar state
 after calling KXmlGuiWindow::showEvent()

KXmlGuiWindow::showEvent() may trigger things such as restoring the window
state

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 kmediaplayer/kmediawindow.cpp | 10 +++++-----
 kmediaplayer/kmediawindow.h   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kmediaplayer/kmediawindow.cpp b/kmediaplayer/kmediawindow.cpp
index 216d54e1..3cd1791e 100644
--- a/kmediaplayer/kmediawindow.cpp
+++ b/kmediaplayer/kmediawindow.cpp
@@ -94,7 +94,7 @@ KMediaWindow::KMediaWindow(QWidget *parent, Qt::WindowFlags flags)
         resize(640, 480);
     }
 
-    connect(m_player, SIGNAL(controlsHidden(bool)), this, SLOT(slotHideMenuBar(bool)));
+    connect(m_player, SIGNAL(controlsHidden(bool)), this, SLOT(slotHideBars(bool)));
     m_menu = new QMenu();
     m_menu->addAction(KIcon("show-menu"), i18n("Show/hide menubar"), this, SLOT(slotMenubar()));
     setContextMenuPolicy(Qt::CustomContextMenu);
@@ -112,8 +112,8 @@ KMediaWindow::KMediaWindow(QWidget *parent, Qt::WindowFlags flags)
 
 KMediaWindow::~KMediaWindow()
 {
-    slotHideMenuBar(true);
-    disconnect(m_player, SIGNAL(controlsHidden(bool)), this, SLOT(slotHideMenuBar(bool)));
+    slotHideBars(true);
+    disconnect(m_player, SIGNAL(controlsHidden(bool)), this, SLOT(slotHideBars(bool)));
     saveAutoSaveSettings();
 
     KConfigGroup recentfilesgroup(m_config, "RecentFiles");
@@ -129,9 +129,9 @@ KMediaWindow::~KMediaWindow()
 
 void KMediaWindow::showEvent(QShowEvent *event)
 {
+    KXmlGuiWindow::showEvent(event);
     m_menuvisible = menuBar()->isVisible();
     m_statusvisible = statusBar()->isVisible();
-    KXmlGuiWindow::showEvent(event);
 }
 
 bool KMediaWindow::eventFilter(QObject *object, QEvent *event)
@@ -142,7 +142,7 @@ bool KMediaWindow::eventFilter(QObject *object, QEvent *event)
     return KXmlGuiWindow::eventFilter(object, event);
 }
 
-void KMediaWindow::slotHideMenuBar(bool visible)
+void KMediaWindow::slotHideBars(bool visible)
 {
     if (!visible) {
         m_menuvisible = menuBar()->isVisible();
diff --git a/kmediaplayer/kmediawindow.h b/kmediaplayer/kmediawindow.h
index df2f6b69..dc89e2c8 100644
--- a/kmediaplayer/kmediawindow.h
+++ b/kmediaplayer/kmediawindow.h
@@ -44,7 +44,7 @@ public slots:
     void slotQuit();
 
 private slots:
-    void slotHideMenuBar(bool hidden);
+    void slotHideBars(bool hidden);
 
 protected:
     void showEvent(QShowEvent *event) final;