X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcorealiasmanager.cpp;h=9576c04b7cccc57f7599a3df196ec196467759ff;hb=73696998505c35c02bd019f78e9f502cbc36da5b;hp=af3353fd7ca37238b18d5c458fd044c5feac2a88;hpb=f7eb3911860f30e6bccce3c77d03fc25e87d7f93;p=quassel.git

diff --git a/src/core/corealiasmanager.cpp b/src/core/corealiasmanager.cpp
index af3353fd..9576c04b 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);
-  }
 }
 
 
@@ -52,7 +50,9 @@ CoreAliasManager::~CoreAliasManager() {
   Core::setUserSetting(session->user(), "Aliases", initAliases());
 }
 
+
 void CoreAliasManager::loadDefaults() {
-  // Default Aliases:
-  addAlias("j", "/join #$1");
+  foreach(Alias alias, AliasManager::defaults()) {
+    addAlias(alias.name, alias.expansion);
+  }
 }