Fix issue with unreversible "Minimize to tray"

This commit is contained in:
Christophe Dumez 2012-06-24 16:25:44 +03:00
parent 80359f3e5e
commit 2eae22ac06

View file

@ -703,13 +703,6 @@ void MainWindow::toggleVisibility(QSystemTrayIcon::ActivationReason e) {
return; return;
} }
show(); show();
if (isMinimized()) {
if (isMaximized()) {
showMaximized();
}else{
showNormal();
}
}
raise(); raise();
activateWindow(); activateWindow();
}else{ }else{
@ -819,7 +812,7 @@ bool MainWindow::event(QEvent * e) {
// Iconify if there is no modal window // Iconify if there is no modal window
if (!has_modal_window) { if (!has_modal_window) {
qDebug("Minimize to Tray enabled, hiding!"); qDebug("Minimize to Tray enabled, hiding!");
e->accept(); e->ignore();
QTimer::singleShot(0, this, SLOT(hide())); QTimer::singleShot(0, this, SLOT(hide()));
return true; return true;
} }