Revert "Fix issue with tray icon double clicking."

This reverts commit a120c8eb28c0dfcdfdb0981c63147bb37d45df2c.

Turns out this prevented Mumble from being able to raise
itself in front of a maximized application. The click
not being reported after using the activateWindow function
is probably a Qt bug and if it's reproducible in a small
sample should be reported.

1 files changed, 7 insertions, 2 deletions

diff --git a/src/mumble/MainWindow.cpp b/src/mumble/MainWindow.cpp
index afbc2ff4c..24116b9fd 100644
--- a/src/mumble/MainWindow.cpp
+++ b/src/mumble/MainWindow.cpp
@@ -2682,9 +2682,11 @@ void MainWindow::trayAboutToShow() {
 }
 
 void MainWindow::on_Icon_messageClicked() {
-	setWindowState((windowState() & ~Qt::WindowMinimized) | Qt::WindowActive);
+	if (isMinimized())
+		setWindowState((windowState() & ~Qt::WindowMinimized) | Qt::WindowActive);
 	show();
 	raise();
+	activateWindow();
 }
 
 void MainWindow::on_Icon_activated(QSystemTrayIcon::ActivationReason reason) {
@@ -2692,7 +2694,10 @@ void MainWindow::on_Icon_activated(QSystemTrayIcon::ActivationReason reason) {
 		case QSystemTrayIcon::Trigger:
 		case QSystemTrayIcon::DoubleClick:
 		case QSystemTrayIcon::MiddleClick:
-			on_Icon_messageClicked();
+			setWindowState((windowState() & ~Qt::WindowMinimized) | Qt::WindowActive);
+			show();
+			raise();
+			activateWindow();
 		default: break;
 	}
 }