X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Ftopicwidget.cpp;h=511d27522520e6730079cab26afbef1a9fbaa3d9;hp=8adb0b6b46b3f4cba2ea5e0c222518fe5a400ef5;hb=fb6f5bcbdebd8660f355a558dd7cc47f6df45965;hpb=a23256347cc47605dd0660127052846427bc998d

diff --git a/src/qtui/topicwidget.cpp b/src/qtui/topicwidget.cpp
index 8adb0b6b..511d2752 100644
--- a/src/qtui/topicwidget.cpp
+++ b/src/qtui/topicwidget.cpp
@@ -32,6 +32,10 @@ TopicWidget::TopicWidget(QWidget *parent)
 }
 
 void TopicWidget::setTopic(const QString &newtopic) {
+  if(_topic == newtopic)
+    return;
+  
+  _topic = newtopic;
   ui.topicButton->setAndStyleText(newtopic);
   ui.topicLineEdit->setText(newtopic);
   switchPlain();
@@ -49,6 +53,7 @@ void TopicWidget::on_topicButton_clicked() {
 void TopicWidget::switchEditable() {
   ui.topicButton->hide();
   ui.topicLineEdit->show();
+  ui.topicLineEdit->setFocus();
 }
 
 void TopicWidget::switchPlain() {
@@ -64,6 +69,7 @@ bool TopicWidget::eventFilter(QObject *obj, QEvent *event) {
 
   if(keyEvent->key() == Qt::Key_Escape) {
     switchPlain();
+    ui.topicLineEdit->setText(_topic);
     return true;
   }