From d7cf0bfae5ae534da60cd01401e85863c2e2122a Mon Sep 17 00:00:00 2001
From: Ximi1970 <ximi.github@gmail.com>
Date: Thu, 4 Jun 2020 13:04:33 +0200
Subject: [PATCH] Fix segfault when closing

---
 app/SysTray-X/SysTray-X.qrc                  |   1 +
 app/SysTray-X/files/icons/dialog-warning.png | Bin 0 -> 3643 bytes
 app/SysTray-X/systrayx.cpp                   |  15 +++++++++++++--
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 app/SysTray-X/files/icons/dialog-warning.png

diff --git a/app/SysTray-X/SysTray-X.qrc b/app/SysTray-X/SysTray-X.qrc
index 0be4112..31354b2 100644
--- a/app/SysTray-X/SysTray-X.qrc
+++ b/app/SysTray-X/SysTray-X.qrc
@@ -11,5 +11,6 @@
         <file>files/icons/window-restore.png</file>
         <file>files/icons/mail-unread.png</file>
         <file>files/icons/help-about.png</file>
+        <file>files/icons/dialog-warning.png</file>
     </qresource>
 </RCC>
diff --git a/app/SysTray-X/files/icons/dialog-warning.png b/app/SysTray-X/files/icons/dialog-warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..76adf783ac18e8850acb7749366001c37f398b1b
GIT binary patch
literal 3643
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

literal 0
HcmV?d00001

diff --git a/app/SysTray-X/systrayx.cpp b/app/SysTray-X/systrayx.cpp
index b7fe2c5..843efd7 100644
--- a/app/SysTray-X/systrayx.cpp
+++ b/app/SysTray-X/systrayx.cpp
@@ -419,7 +419,10 @@ void    SysTrayX::slotAddOnShutdown()
     /*
      *  Hide systray icon to prevent ghost systray icon in Windows
      */
-    m_tray_icon->hide();
+    if( m_tray_icon )
+    {
+        m_tray_icon->hide();
+    }
 
     /*
      *  Close the TB window
@@ -448,7 +451,10 @@ void    SysTrayX::slotShutdown()
         /*
          *  Hide systray icon to prevent ghost systray icon in Windows
          */
-        m_tray_icon->hide();
+        if( m_tray_icon )
+        {
+            m_tray_icon->hide();
+        }
 
         /*
          *  Close the TB window
@@ -494,5 +500,10 @@ void    SysTrayX::slotVersion( QString version )
             m_tray_icon->showMessage("SysTray-X Warning", "Version mismatch addon and app",
                 QSystemTrayIcon::Warning );
         }
+
+        if( m_tray_icon2 )
+        {
+            m_tray_icon2->showMessage("SysTray-X Warning", "Version mismatch addon and app", ":/files/icons/dialog-warning.png" );
+        }
     }
 }