From e65e7d9cbe767e20496c53392b8f2f4e65143ed9 Mon Sep 17 00:00:00 2001 From: Patrick von Reth Date: Wed, 4 Feb 2015 10:00:53 +0100 Subject: [PATCH] don't unload plugins if they failed to initialize so we have the possibility to use their settings --- src/core/snore.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/snore.cpp b/src/core/snore.cpp index dfe3eb9..3621b48 100644 --- a/src/core/snore.cpp +++ b/src/core/snore.cpp @@ -67,8 +67,8 @@ void SnoreCore::loadPlugins(SnorePlugin::PluginTypes types) if (!plugin->initialize()) { snoreDebug(SNORE_WARNING) << "Failed to initialize" << plugin->name(); plugin->deinitialize(); - info->unload(); - continue; + //info->unload(); + break; } } } @@ -94,7 +94,7 @@ void SnoreCore::broadcastNotification(Notification notification) { Q_D(SnoreCore); snoreDebug(SNORE_DEBUG) << "Broadcasting" << notification << "timeout:" << notification.timeout(); - if (d->m_notificationBackend != NULL) { + if (d->m_notificationBackend != nullptr) { if (notification.isUpdate() && !d->m_notificationBackend->canUpdateNotification()) { requestCloseNotification(notification.old(), Notification::REPLACED); }