github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-20 21:33:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #5855 from Chocobo1/tray_icon_crash

Browse source 
Fix tray icon crash
This commit is contained in:
sledgehammer999 2016-10-24 19:25:11 +03:00 • committed by GitHub
commit 3e12d958e9
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/gui/mainwindow.cpp
View file

@ -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)