Commit 683749ec authored by Laurent Montel's avatar Laurent Montel 😁

Fix Bug 386328 - Akregator crashes when opening configuration dialog if "Show...

Fix Bug 386328 - Akregator crashes when opening configuration dialog if "Show Tray Icon" is disabled

BUG: 386328
parent 26ab6152
......@@ -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"));
......
......@@ -32,7 +32,7 @@
using namespace Akregator;
TrayIcon *TrayIcon::m_instance = 0;
TrayIcon *TrayIcon::m_instance = nullptr;
TrayIcon *TrayIcon::getInstance()
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment