X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientuserinputhandler.cpp;h=3e7ece3c3226f435463c5b9bb0a94db055e1fd0d;hp=8abc79dd3e3527e4ee2441617288ad293ef19171;hb=f47c3bdeacbc163f558751bf090d499fd1a36cb6;hpb=1cb98a44044e7756fa58ae67a6065015d776ba0c

diff --git a/src/client/clientuserinputhandler.cpp b/src/client/clientuserinputhandler.cpp
index 8abc79dd..3e7ece3c 100644
--- a/src/client/clientuserinputhandler.cpp
+++ b/src/client/clientuserinputhandler.cpp
@@ -29,6 +29,7 @@
 #include "network.h"
 #include "types.h"
 #include "bufferinfo.h"
+#include "messagemodel.h"
 
 #include <QDateTime>
 
@@ -81,12 +82,20 @@ void ClientUserInputHandler::handleExec(const BufferInfo &bufferInfo, const QStr
 }
 
 void ClientUserInputHandler::handleJoin(const BufferInfo &bufferInfo, const QString &text) {
+  if(text.isEmpty()) {
+    Client::messageModel()->insertErrorMessage(bufferInfo, tr("/JOIN expects a channel"));
+    return;
+  }
   switchBuffer(bufferInfo.networkId(), text.section(' ', 0, 0));
   // send to core
   defaultHandler("JOIN", bufferInfo, text);
 }
 
 void ClientUserInputHandler::handleQuery(const BufferInfo &bufferInfo, const QString &text) {
+  if(text.isEmpty()) {
+    Client::messageModel()->insertErrorMessage(bufferInfo, tr("/QUERY expects at least a nick"));
+    return;
+  }
   switchBuffer(bufferInfo.networkId(), text.section(' ', 0, 0));
   // send to core
   defaultHandler("QUERY", bufferInfo, text);