From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Sat, 15 Nov 2008 10:30:03 +0000 (+0100)
Subject: fixing BR #297 - the core now really loads the default aliases if the list is empty
X-Git-Tag: 0.3.1~39
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=d36b7f8ed6ec4474492c60e3c16b3d6755630e3c

fixing BR #297 - the core now really loads the default aliases if the list is empty
---

diff --git a/src/core/corealiasmanager.cpp b/src/core/corealiasmanager.cpp
index b8943562..f75dd3c6 100644
--- a/src/core/corealiasmanager.cpp
+++ b/src/core/corealiasmanager.cpp
@@ -34,11 +34,9 @@ CoreAliasManager::CoreAliasManager(CoreSession *parent)
   }
 
   QVariantMap aliases = Core::getUserSetting(session->user(), "Aliases").toMap();
-  if(aliases.isEmpty()) {
+  initSetAliases(Core::getUserSetting(session->user(), "Aliases").toMap());
+  if(isEmpty())
     loadDefaults();
-  } else {
-    initSetAliases(aliases);
-  }
 }