diff options
Diffstat (limited to 'close-fix.diff')
| -rw-r--r-- | close-fix.diff | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/close-fix.diff b/close-fix.diff index 2b931508c52f..4625d3e455cd 100644 --- a/close-fix.diff +++ b/close-fix.diff @@ -1,12 +1,11 @@ diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp -index 14921028c..a02f0548c 100644 +index 14921028c..4216e6237 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp -@@ -1443,20 +1443,6 @@ void MainWindow::StopAfterCurrent() { - app_->playlist_manager()->active()->stop_after_current()); +@@ -1444,17 +1444,9 @@ void MainWindow::StopAfterCurrent() { } --void MainWindow::closeEvent(QCloseEvent* event) { + void MainWindow::closeEvent(QCloseEvent* event) { - bool keep_running(false); - if (tray_icon_) - keep_running = @@ -18,20 +17,9 @@ index 14921028c..a02f0548c 100644 - } else { - Exit(); - } --} -- - void MainWindow::SetHiddenInTray(bool hidden) { - settings_.setValue("hidden", hidden); - -diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h -index 5b2983bb4..756f33a47 100644 ---- a/src/ui/mainwindow.h -+++ b/src/ui/mainwindow.h -@@ -134,7 +134,6 @@ class MainWindow : public QMainWindow, public PlatformInterface { - void keyPressEvent(QKeyEvent* event); - void changeEvent(QEvent*); - void resizeEvent(QResizeEvent*); -- void closeEvent(QCloseEvent* event); ++ if (!tray_icon_ || !tray_icon_->IsVisible()) ++ Exit(); ++ QMainWindow::closeEvent(event); + } - #ifdef Q_OS_WIN32 - bool winEvent(MSG* message, long* result); + void MainWindow::SetHiddenInTray(bool hidden) { |