From 172fc793275c02ffc01c8fd9a4a10fff9087b0b2 Mon Sep 17 00:00:00 2001 From: Zach H Date: Sun, 19 Feb 2017 08:52:44 -0500 Subject: [PATCH] fix crash if no trayicon found (#2415) --- cockatrice/src/window_main.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cockatrice/src/window_main.cpp b/cockatrice/src/window_main.cpp index d87ad423..86069c73 100644 --- a/cockatrice/src/window_main.cpp +++ b/cockatrice/src/window_main.cpp @@ -715,8 +715,11 @@ MainWindow::MainWindow(QWidget *parent) MainWindow::~MainWindow() { - trayIcon->hide(); - trayIcon->deleteLater(); + if (trayIcon) { + trayIcon->hide(); + trayIcon->deleteLater(); + } + client->deleteLater(); clientThread->wait(); }