Fix grammar bug in ChatViewSettings

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

diff --git a/src/client/coreconnection.cpp b/src/client/coreconnection.cpp
index ab42b74..58335bb 100644 (file)
--- a/src/client/coreconnection.cpp
+++ b/src/client/coreconnection.cpp
@@ -352,7 +352,9 @@ void CoreConnection::disconnectFromCore()
 
 void CoreConnection::disconnectFromCore(const QString &errorString, bool wantReconnect)
 {
-    if (!wantReconnect)
+    if (wantReconnect)
+        _reconnectTimer.start();
+    else
         _reconnectTimer.stop();
 
     _wantReconnect = wantReconnect; // store if disconnect was requested
@@ -537,7 +539,11 @@ void CoreConnection::coreSocketConnected()
     clientInit["ClientVersion"] = Quassel::buildInfo().fancyVersionString;
     clientInit["ClientDate"] = Quassel::buildInfo().buildDate;
     clientInit["ProtocolVersion"] = Quassel::buildInfo().protocolVersion;
+#ifdef HAVE_SSL
     clientInit["UseSsl"] = _account.useSsl();
+#else
+    clientInit["UseSsl"] = false;
+#endif
 #ifndef QT_NO_COMPRESS
     clientInit["UseCompression"] = true;
 #else