X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclientsettings.cpp;h=e4a76c3f719e785b9b618155472957df5d832b60;hb=082cb8c8eb6db90cbb2166a0098874e76d5c6ad9;hp=d44ad6a86c95da3132c22c5874cb1c4d3e0e6a9d;hpb=a95ad2de573027f9bee36db972bcae4195168d0c;p=quassel.git

diff --git a/src/client/clientsettings.cpp b/src/client/clientsettings.cpp
index d44ad6a8..e4a76c3f 100644
--- a/src/client/clientsettings.cpp
+++ b/src/client/clientsettings.cpp
@@ -23,10 +23,8 @@
 #include <utility>
 
 #include <QHostAddress>
+#include <QSslSocket>
 #include <QStringList>
-#ifdef HAVE_SSL
-#    include <QSslSocket>
-#endif
 
 #include "client.h"
 #include "quassel.h"
@@ -298,7 +296,7 @@ void NotificationSettings::setHighlightNick(NotificationSettings::HighlightNickT
 
 NotificationSettings::HighlightNickType NotificationSettings::highlightNick() const
 {
-    return (NotificationSettings::HighlightNickType)localValue("Highlights/HighlightNick", CurrentNick).toInt();
+    return (NotificationSettings::HighlightNickType)localValue("Highlights/HighlightNick", NoNick).toInt();
 }
 
 void NotificationSettings::setNicksCaseSensitive(bool cs)