From 92853f2c7b6d83f251fef43d742dad7942feb95d Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tmatth@videolan.org>
Date: Fri, 3 May 2019 02:21:29 -0400
Subject: [PATCH] UI: fix crash due to NULL dereference

---
 UI/window-basic-main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp
index 101587826..e7a7d0e7f 100644
--- a/UI/window-basic-main.cpp
+++ b/UI/window-basic-main.cpp
@@ -6830,7 +6830,7 @@ void OBSBasic::IconActivated(QSystemTrayIcon::ActivationReason reason)
 void OBSBasic::SysTrayNotify(const QString &text,
 		QSystemTrayIcon::MessageIcon n)
 {
-	if (QSystemTrayIcon::supportsMessages()) {
+	if (trayIcon && QSystemTrayIcon::supportsMessages()) {
 		QSystemTrayIcon::MessageIcon icon =
 				QSystemTrayIcon::MessageIcon(n);
 		trayIcon->showMessage("OBS Studio", text, icon, 10000);