X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Finputline.cpp;h=c04a3f251a8fdb750916280680313b719b60e3b6;hp=d7b18f4716830fa0f926d5bec86fbfc9add1ab73;hb=af569a42f6635f6abfcedeb45b730ee64d53e0b8;hpb=0f94681b05463c64c75d25d18a0ab2fd1d4af7b9

diff --git a/src/uisupport/inputline.cpp b/src/uisupport/inputline.cpp
index d7b18f47..c04a3f25 100644
--- a/src/uisupport/inputline.cpp
+++ b/src/uisupport/inputline.cpp
@@ -131,7 +131,14 @@ void InputLine::keyPressEvent(QKeyEvent * event) {
 //Since this is a ktextedit, we don't have this signal "natively"
   case Qt::Key_Return:
     event->accept();
-    emit returnPressed();
+    if(!text().isEmpty())
+      emit returnPressed();
+    break;
+
+  case Qt::Key_Enter:
+    event->accept();
+    if(!text().isEmpty())
+      emit returnPressed();
     break;
 
 #endif
@@ -213,9 +220,11 @@ void InputLine::on_textChanged(QString newText) {
   }
 
   foreach(QString line, lines) {
-    clear();
-    insert(line);
-    emit returnPressed();
+    if(!line.isEmpty()) {
+      clear();
+      insert(line);
+      emit returnPressed();
+    }
   }
 //   if(newText.contains(lineSep)) {
 //     clear();