From bbae4fc5a6c9ddc99ed581b905339d2060b9a39c Mon Sep 17 00:00:00 2001
From: Patrick von Reth <vonreth@kde.org>
Date: Sun, 19 Jan 2014 19:13:39 +0100
Subject: [PATCH] changes to plugin initialisation

---
 src/core/snore.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/core/snore.cpp b/src/core/snore.cpp
index f53bd6c..87bd7a7 100644
--- a/src/core/snore.cpp
+++ b/src/core/snore.cpp
@@ -167,8 +167,8 @@ bool SnoreCore::setPrimaryNotificationBackend ( const QString &backend )
     Q_D(SnoreCore);
     if(!PluginContainer::pluginCache().contains(backend))
     {
-        qDebug()<<"Unknown Backend:"<<backend;
-        return setPrimaryNotificationBackend();
+        qDebug() << "Unknown Backend:" << backend;
+        return false;
     }
     qDebug() << "Setting Notification Backend to:" << backend;
     SnoreBackend* b = qobject_cast<SnoreBackend*>(PluginContainer::pluginCache()[backend]->load());
@@ -211,7 +211,7 @@ bool SnoreCore::setPrimaryNotificationBackend()
 #elif defined(Q_OS_LINUX)
     if( backends.contains("FreedesktopNotification_Backend"))
     {
-        return setPrimaryNotificationBackend("FreedesktopNotification_Backend");
+        return setPrimaryNotificationBackend("FreedesktopNotification");
     }
 #elif defined(Q_OS_MAC)
     if( backends.contains("Growl"))
@@ -244,9 +244,9 @@ QSystemTrayIcon *SnoreCore::trayIcon(){
 Notification SnoreCore::getActiveNotificationByID(uint id)
 {
     Q_D(SnoreCore);
-    if(!d->m_notificationBackend->isInitialized()){
-        qDebug() << "Notification backend " << d->m_notificationBackend << " isn't initialized will snore will exit now";
-        qApp->quit();
+    if(!d->m_notificationBackend->isInitialized())
+    {
+        qFatal("Notification backend %s isn't initialized will snore will exit now",d->m_notificationBackend->name().toLatin1().constData());
     }
     return d->m_notificationBackend->getActiveNotificationByID(id);
 }