Fix Bug 386328 - Akregator crashes when opening configuration dialog …

…if "Show Tray Icon" is disabled BUG: 386328
KDE · 683749ec6391fc7b1fe4e2a43f15f12ebe482f02 · Montel committed Oct 30, 2017 · Oct 30, 2017 · 683749e
1 parent 26ab615
commit 683749ec6391fc7b1fe4e2a43f15f12ebe482f02
Unified Split

Showing with 5 additions and 3 deletions.

+4 −2 src/akregator_part.cpp

+1 −1 src/trayicon.cpp
diff --git a/src/akregator_part.cpp b/src/akregator_part.cpp
@@ -655,8 +655,10 @@ void Part::showOptions()
         m_dialog = new KCMultiDialog(m_mainWidget);
         connect(m_dialog, QOverload<>::of(&KCMultiDialog::configCommitted),
                 this, &Part::slotSettingsChanged);
-        connect(m_dialog, QOverload<>::of(&KCMultiDialog::configCommitted),
-                TrayIcon::getInstance(), &TrayIcon::settingsChanged);
+        if (TrayIcon::getInstance()) {
+            connect(m_dialog, QOverload<>::of(&KCMultiDialog::configCommitted),
+                    TrayIcon::getInstance(), &TrayIcon::settingsChanged);
+        }
 
         m_dialog->addModule(QStringLiteral("akregator_config_general"));
         m_dialog->addModule(QStringLiteral("akregator_config_appearance"));
diff --git a/src/trayicon.cpp b/src/trayicon.cpp
@@ -32,7 +32,7 @@
 
 using namespace Akregator;
 
-TrayIcon *TrayIcon::m_instance = 0;
+TrayIcon *TrayIcon::m_instance = nullptr;
 
 TrayIcon *TrayIcon::getInstance()
 {