X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Finputwidget.cpp;h=cd48764d709174922f7f7de63f59714622e38d14;hp=cd832a9173480ba5e9c3e2f59d8705b47f5513e8;hb=f448828fb29f3d23d9306f777cd264a13fde0e9a;hpb=8056d708179608e637f351e975dcc4efe01247d1;ds=sidebyside

diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp
index cd832a91..cd48764d 100644
--- a/src/qtui/inputwidget.cpp
+++ b/src/qtui/inputwidget.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -62,9 +62,9 @@ InputWidget::~InputWidget() {
 }
 
 void InputWidget::currentChanged(const QModelIndex &current, const QModelIndex &previous) {
+  Q_UNUSED(previous)
   NetworkId networkId = current.data(NetworkModel::NetworkIdRole).value<NetworkId>();
-  NetworkId previousNetworkId = previous.data(NetworkModel::NetworkIdRole).value<NetworkId>();
-  if(networkId == previousNetworkId)
+  if(networkId == _networkId)
     return;
 
   setNetwork(networkId);
@@ -133,13 +133,11 @@ void InputWidget::setNetwork(NetworkId networkId) {
   const Network *network = Client::network(networkId);
   if(network) {
     connect(network, SIGNAL(identitySet(IdentityId)), this, SLOT(setIdentity(IdentityId)));
-    if(network->me())
-      connectMyIrcUser();
-    else
-      connect(network, SIGNAL(myNickSet(const QString &)), this, SLOT(connectMyIrcUser()));
+    connectMyIrcUser();
     setIdentity(network->identity());
   } else {
     setIdentity(0);
+    _networkId = 0;
   }
 }
 
@@ -152,6 +150,8 @@ void InputWidget::connectMyIrcUser() {
     connect(network->me(), SIGNAL(userModesRemoved(QString)), this, SLOT(updateNickSelector()));
     connect(network->me(), SIGNAL(awaySet(bool)), this, SLOT(updateNickSelector()));
     disconnect(network, SIGNAL(myNickSet(const QString &)), this, SLOT(connectMyIrcUser()));
+  } else {
+    connect(network, SIGNAL(myNickSet(const QString &)), this, SLOT(connectMyIrcUser()));
   }
 }