Merge branch '2.0'

2015-12-15 21:05:00 +01:00
parent 0c36c40a5d 24275d8dc4
commit ecfbf72a57
33 changed files with 9516 additions and 347 deletions
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -447,7 +447,8 @@ void MainWindow::closeEvent(QCloseEvent* event)
 void MainWindow::changeEvent(QEvent* event)
 {
    if ((event->type() == QEvent::WindowStateChange) && isMinimized()
-            && isTrayIconEnabled() && config()->get("GUI/MinimizeToTray").toBool())
+            && isTrayIconEnabled() && m_trayIcon && m_trayIcon->isVisible()
+            && config()->get("GUI/MinimizeToTray").toBool())
    {
        event->ignore();
        QTimer::singleShot(0, this, SLOT(hide()));