fixes #580 - nick-dropdown is updated even if nickchange fails

[quassel.git] / src / qtui / inputwidget.cpp

diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp
index 7d10969..d4ca832 100644 (file)
--- a/src/qtui/inputwidget.cpp
+++ b/src/qtui/inputwidget.cpp
@@ -155,6 +155,7 @@ 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()));
+    updateNickSelector();
   } else {
     connect(network, SIGNAL(myNickSet(const QString &)), this, SLOT(connectMyIrcUser()));
   }
@@ -172,8 +173,9 @@ void InputWidget::setIdentity(IdentityId identityId) {
 
   const Identity *identity = Client::identity(identityId);
   if(identity) {
-    connect(identity, SIGNAL(nicksSet(QStringList)),
-           this, SLOT(updateNickSelector()));
+    connect(identity, SIGNAL(nicksSet(QStringList)), this, SLOT(updateNickSelector()));
+  } else {
+    _identityId = 0;
   }
   updateNickSelector();
 }
@@ -187,7 +189,7 @@ void InputWidget::updateNickSelector() const {
 
   const Identity *identity = Client::identity(net->identity());
   if(!identity) {
-    qWarning() << "InputWidget::updateNickSelector(): can't find Identity for Network" << net->networkId();
+    qWarning() << "InputWidget::updateNickSelector(): can't find Identity for Network" << net->networkId() << "IdentityId:" << net->identity();
     return;
   }
 
@@ -202,8 +204,11 @@ void InputWidget::updateNickSelector() const {
     return;
 
   IrcUser *me = net->me();
-  if(me)
-    nicks[nickIdx] = net->myNick() + QString(" (+%1)").arg(me->userModes());
+  if(me) {
+    nicks[nickIdx] = net->myNick();
+    if(!me->userModes().isEmpty())
+      nicks[nickIdx] += QString(" (+%1)").arg(me->userModes());
+  }
       
   ui.ownNick->addItems(nicks);
 
@@ -217,7 +222,11 @@ void InputWidget::changeNick(const QString &newNick) const {
   const Network *net = currentNetwork();
   if(!net || net->isMyNick(newNick))
     return;
-  emit userInput(currentBufferInfo(), QString("/nick %1").arg(newNick));
+
+  // we reset the nick selecter as we have no confirmation yet, that this will succeed.
+  // if the action succeeds it will be properly updated anyways.
+  updateNickSelector();
+  emit userInput(BufferInfo::fakeStatusBuffer(net->networkId()), QString("/nick %1").arg(newNick));
 }
 
 void InputWidget::sendText(QString text) {