1 files changed, 2 insertions, 10 deletions
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());