Merge branch 'seezer'

[quassel.git] / src / common / network.cpp

diff --git a/src/common/network.cpp b/src/common/network.cpp
index 4a1d6c8..cfcda7d 100644 (file)
--- a/src/common/network.cpp
+++ b/src/common/network.cpp
@@ -406,8 +406,9 @@ void Network::setConnected(bool connected) {
   
   _connected = connected;
   if(!connected) {
-    removeChansAndUsers();
+    setMyNick(QString());
     setCurrentServer(QString());
+    removeChansAndUsers();
   }
   emit connectedSet(connected);
 }
@@ -422,6 +423,9 @@ void Network::setConnectionState(int state) {
 
 void Network::setMyNick(const QString &nickname) {
   _myNick = nickname;
+  if(!_myNick.isEmpty() && !ircUser(myNick())) {
+    newIrcUser(myNick());
+  }
   emit myNickSet(nickname);
 }