X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Finputwidget.cpp;h=3c7bec537a01dd78edcd153e55570428bc0d03f4;hb=868e5d2bfef8b01e22fdc8b1256228a1f214e1bc;hp=299ebce0e52551d380f04ec90d91a1a986f391c1;hpb=c14a00f37179e49f034dc64b4da0c86b51caed5d;p=quassel.git

diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp
index 299ebce0..3c7bec53 100644
--- a/src/qtui/inputwidget.cpp
+++ b/src/qtui/inputwidget.cpp
@@ -45,11 +45,8 @@ InputWidget::InputWidget(QWidget *parent)
   ui.inputEdit->installEventFilter(new JumpKeyHandler(this));
 
   QtUiStyleSettings s("Fonts");
-  s.notify("InputLine", this, SLOT(setFont(QVariant)));
-  QFont font = s.value("InputLine", QFont()).value<QFont>();
-  if(font.family().isEmpty())
-    font = QApplication::font();
-  setFont(font);
+  s.notify("InputLine", this, SLOT(setCustomFont(QVariant)));
+  setCustomFont(s.value("InputLine", QFont()));
 
   ActionCollection *coll = QtUi::actionCollection();
 
@@ -158,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()));
   }
@@ -175,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();
 }
@@ -190,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;
   }