Merge pull request #855 from MP2E/master

UI: Fix segfault when no system tray exists
2017-03-25 08:53:02 -07:00 · 2017-03-25 08:53:02 -07:00 · 3a3015aecd
parent f1c8ae3532 c47cb25434
commit 3a3015aecd
1 changed files with 1 additions and 0 deletions
--- a/UI/window-basic-main.cpp
+++ b/UI/window-basic-main.cpp
@ -2930,6 +2930,7 @@ void OBSBasic::changeEvent(QEvent *event)
 {
 	if (event->type() == QEvent::WindowStateChange &&
 	    isMinimized() &&
+	    trayIcon &&
 	    trayIcon->isVisible() &&
 	    sysTrayMinimizeToTray()) {