From 5a1dcd5e07af735c0ae1af96e544ab15ad13baff Mon Sep 17 00:00:00 2001 From: Arno Date: Wed, 8 Mar 2017 14:24:14 +0100 Subject: Quit BeetPlayer when closing the main window Adding QSystemTrayIcon actually changed that behavior... --- beetplayer.cpp | 4 ++++ beetplayer.h | 3 +++ playerwidget.cpp | 1 - playerwidget.h | 3 +-- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/beetplayer.cpp b/beetplayer.cpp index 9d59878..ef3f84f 100644 --- a/beetplayer.cpp +++ b/beetplayer.cpp @@ -171,3 +171,7 @@ void BeetPlayer::createStatusbar(){ } +void BeetPlayer::closeEvent(QCloseEvent *event){ + Q_UNUSED(event); + qApp->quit(); +} diff --git a/beetplayer.h b/beetplayer.h index f37a05a..3fd1cb5 100644 --- a/beetplayer.h +++ b/beetplayer.h @@ -21,6 +21,9 @@ class BeetPlayer : public QMainWindow { void setPlayListLength(quint64 seconds); void setMessage(const QString &msg); + protected: + virtual void closeEvent(QCloseEvent *event); + private: void openDatabase(); void readSettings(); diff --git a/playerwidget.cpp b/playerwidget.cpp index 5b907d8..9bd9013 100644 --- a/playerwidget.cpp +++ b/playerwidget.cpp @@ -19,7 +19,6 @@ #include #include #include -#include #include #include diff --git a/playerwidget.h b/playerwidget.h index 67e89be..2c5542b 100644 --- a/playerwidget.h +++ b/playerwidget.h @@ -3,7 +3,7 @@ #include #include -#include +#include class QStandardItemModel; class QStandardItem; @@ -16,7 +16,6 @@ class QToolBar; class QAction; class BeetPlayerProxy; class BeetView; -class QSystemTrayIcon; class PlayerWidget : public QWidget { Q_OBJECT -- cgit v1.2.3-70-g09d2