Browse Source

Merge pull request #5855 from Chocobo1/tray_icon_crash

Fix tray icon crash
adaptive-webui-19844
sledgehammer999 8 years ago committed by GitHub
parent
commit
3e12d958e9
  1. 4
      src/gui/mainwindow.cpp

4
src/gui/mainwindow.cpp

@ -920,7 +920,7 @@ void MainWindow::toggleVisibility(QSystemTrayIcon::ActivationReason e)
return; return;
} }
// Make sure the window is not minimized // Make sure the window is not minimized
setWindowState(windowState() & (~Qt::WindowMinimized | Qt::WindowActive)); setWindowState((windowState() & ~Qt::WindowMinimized) | Qt::WindowActive);
// Then show it // Then show it
show(); show();
raise(); raise();
@ -1600,7 +1600,7 @@ void MainWindow::showConnectionSettings()
void MainWindow::minimizeWindow() void MainWindow::minimizeWindow()
{ {
setWindowState(windowState() ^ Qt::WindowMinimized); setWindowState(windowState() | Qt::WindowMinimized);
} }
void MainWindow::on_actionExecutionLogs_triggered(bool checked) void MainWindow::on_actionExecutionLogs_triggered(bool checked)

Loading…
Cancel
Save