X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fcoreconnection.cpp;h=4928a8bfbd6e2b4da95455ed9a44b4652ea0338e;hb=447501045b6fe14fdeff95823e2ea85416da7a77;hp=db18ef436c9181d7e1dbdc958977e68e287e78f2;hpb=b654b2f908590b6f69a7edadf9dacf1277a4493b;p=quassel.git

diff --git a/src/client/coreconnection.cpp b/src/client/coreconnection.cpp
index db18ef43..4928a8bf 100644
--- a/src/client/coreconnection.cpp
+++ b/src/client/coreconnection.cpp
@@ -211,8 +211,10 @@ bool CoreConnection::isLocalConnection() const
         return false;
     if (currentAccount().isInternal())
         return true;
-    if (_peer->isLocal())
-        return true;
+    if (_authHandler)
+        return _authHandler->isLocal();
+    if (_peer)
+        return _peer->isLocal();
 
     return false;
 }
@@ -378,8 +380,6 @@ void CoreConnection::connectToCurrentAccount()
         return;
     }
 
-    resetConnection(false);
-
     if (currentAccount().isInternal()) {
         if (Quassel::runMode() != Quassel::Monolithic) {
             qWarning() << "Cannot connect to internal core in client-only mode!";