From 2972e874245b9aa192c89885d67253aeb3c1eede Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Sat, 10 Sep 2011 15:02:37 +0000
Subject: improved "hide on close" feature

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2344 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/Ui/skinned/mainwindow.cpp | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'src/plugins/Ui/skinned/mainwindow.cpp')

diff --git a/src/plugins/Ui/skinned/mainwindow.cpp b/src/plugins/Ui/skinned/mainwindow.cpp
index e41b4b86f..a68fcfe16 100644
--- a/src/plugins/Ui/skinned/mainwindow.cpp
+++ b/src/plugins/Ui/skinned/mainwindow.cpp
@@ -107,7 +107,6 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     connect(m_core, SIGNAL(elapsedChanged(qint64)),m_playlist, SLOT(setTime(qint64)));
     connect(m_core, SIGNAL(metaDataChanged()),SLOT(showMetaData()));
     connect(m_uiHelper, SIGNAL(toggleVisibilityCalled()), SLOT(toggleVisibility()));
-    connect(m_uiHelper, SIGNAL(exitCalled()), SLOT(close()));
 
     readSettings();
     m_display->setEQ(m_equalizer);
@@ -205,7 +204,8 @@ void MainWindow::closeEvent (QCloseEvent *)
     writeSettings();
     m_playlist->close();
     m_equalizer->close();
-    QApplication::quit ();
+    if (!m_hideOnClose || !m_uiHelper->visibilityControl())
+        m_uiHelper->exit();
 }
 
 void MainWindow::addDir()
@@ -467,14 +467,6 @@ void MainWindow::jumpToFile()
     m_uiHelper->jumpToTrack(this);
 }
 
-void MainWindow::handleCloseRequest()
-{
-    if (m_hideOnClose && m_uiHelper->visibilityControl())
-        toggleVisibility();
-    else
-        QApplication::closeAllWindows();
-}
-
 void MainWindow::addUrl()
 {
     AddUrlDialog::popup(this, m_pl_manager->selectedPlayList());
-- 
cgit v1.2.3-13-gbd6f