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

[quassel.git] / src / core / corealiasmanager.cpp

diff --git a/src/core/corealiasmanager.cpp b/src/core/corealiasmanager.cpp
index b894356..f75dd3c 100644 (file)
--- 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();
   }
 
   QVariantMap aliases = Core::getUserSetting(session->user(), "Aliases").toMap();

-  if(aliases.isEmpty()) {
+  initSetAliases(Core::getUserSetting(session->user(), "Aliases").toMap());
+  if(isEmpty())

     loadDefaults();
     loadDefaults();

-  } else {
-    initSetAliases(aliases);
-  }

 }
 
 
 }