From 0f170bfa614bdf264d68ffea2427953e225562c7 Mon Sep 17 00:00:00 2001
From: Mikkel Krautz <mikkel@krautz.dk>
Date: Fri, 2 Dec 2016 00:06:36 +0100
Subject: [PATCH] MainWindow: disable MainWindow::changeEvent on macOS; it
 causes Mumble to be non-interactive after restoring from being minimized.

Fixes mumble-voip/mumble#2171
---
 src/mumble/MainWindow.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/mumble/MainWindow.cpp b/src/mumble/MainWindow.cpp
index 08f924db7..0fa9cee15 100644
--- a/src/mumble/MainWindow.cpp
+++ b/src/mumble/MainWindow.cpp
@@ -503,10 +503,19 @@ void MainWindow::showEvent(QShowEvent *e) {
 
 void MainWindow::changeEvent(QEvent *e) {
 	QWidget::changeEvent(e);
+
+#ifdef Q_OS_MAC
+	// On modern macOS/Qt combinations, the code below causes Mumble's
+	// MainWindow to not be interactive after returning from being minimized.
+	// (See issue mumble-voip/mumble#2171)
+	// So, let's not do it on macOS.
+
+#else
 	if (isMinimized() && g.s.bHideInTray) {
 		// Workaround http://qt-project.org/forums/viewthread/4423/P15/#50676
 		QTimer::singleShot(0, this, SLOT(hide()));
 	}
+#endif
 }
 
 void MainWindow::keyPressEvent(QKeyEvent *e) {