another try to fix those win/linux crashes :)

[quassel.git] / src / client / clientsettings.cpp

diff --git a/src/client/clientsettings.cpp b/src/client/clientsettings.cpp
index 1c3c5cf..3a1dbd8 100644 (file)
--- a/src/client/clientsettings.cpp
+++ b/src/client/clientsettings.cpp
@@ -39,7 +39,8 @@ CoreAccountSettings::CoreAccountSettings(const QString &subgroup) : ClientSettin
 QList<AccountId> CoreAccountSettings::knownAccounts() {
   QList<AccountId> ids;
   foreach(QString key, localChildGroups()) {
-    ids << key.toInt();
+    AccountId acc = key.toInt();
+    if(acc.isValid()) ids << acc;
   }
   return ids;
 }
@@ -118,10 +119,10 @@ QVariantList NotificationSettings::highlightList() {
   return localValue("highlightList").toList();
 }
 
-void NotificationSettings::setHighlightCurrentNick(const bool &highlightCurrentNick) {
-  setLocalValue("highlightCurrentNick", highlightCurrentNick);
+void NotificationSettings::setHighlightNick(NotificationSettings::HighlightNickType highlightNickType) {
+  setLocalValue("highlightNick", highlightNickType);
 }
 
-bool NotificationSettings::highlightCurrentNick() {
-  return localValue("highlightCurrentNick", true).toBool();
+NotificationSettings::HighlightNickType NotificationSettings::highlightNick() {
+  return (NotificationSettings::HighlightNickType) localValue("highlightNick", CurrentNick).toInt();
 }