From 5219aacd319986e5db17b3d964246b5d4a75b591 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20J=2EV=2E=20Bertin?= Date: Wed, 5 Nov 2014 13:46:10 +0100 Subject: [PATCH] don't handle events for systray when shutting down, avoiding null pointer dereference and crash REVIEW: 120999 BUG: 340624 --- kmsystemtray.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kmsystemtray.cpp b/kmsystemtray.cpp index a960a790b..dfea25d7b 100644 --- a/kmsystemtray.cpp +++ b/kmsystemtray.cpp @@ -105,7 +105,7 @@ KMSystemTray::KMSystemTray(QObject *parent) bool KMSystemTray::buildPopupMenu() { KMMainWidget * mainWidget = kmkernel->getKMMainWidget(); - if ( !mainWidget ) { + if ( !mainWidget || kmkernel->shuttingDown() ) { return false; }