From 767d5344094aaa0c4530a60545e8cf1957d23efa Mon Sep 17 00:00:00 2001
From: jp9000 <obs.jim@gmail.com>
Date: Wed, 1 May 2019 12:11:05 -0700
Subject: [PATCH] UI: Check for valid systen tray pointer

Fixes a potential crash that can happen if the system tray is not
initialized for whatever reason.
---
 UI/window-basic-main.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp
index c9a90be43..9e29bb0c4 100644
--- a/UI/window-basic-main.cpp
+++ b/UI/window-basic-main.cpp
@@ -6866,6 +6866,8 @@ void OBSBasic::SystemTray(bool firstStarted)
 {
 	if (!QSystemTrayIcon::isSystemTrayAvailable())
 		return;
+	if (!trayIcon)
+		return;
 
 	bool sysTrayWhenStarted = config_get_bool(GetGlobalConfig(),
 			"BasicWindow", "SysTrayWhenStarted");