X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientuserinputhandler.cpp;h=652873774bd6fb0dc5ee66bf4831b3c832f9e60f;hp=7c839eb83cfe05c553244cd4436af130c29c4fa4;hb=03285df24f3e4eac5badc13fedc13603d912ecdc;hpb=c1cf157116de7fc3da96203aa6f03c38c7ebb650

diff --git a/src/client/clientuserinputhandler.cpp b/src/client/clientuserinputhandler.cpp
index 7c839eb8..65287377 100644
--- a/src/client/clientuserinputhandler.cpp
+++ b/src/client/clientuserinputhandler.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2018 by the Quassel Project                        *
+ *   Copyright (C) 2005-2020 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -91,13 +91,18 @@ 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;
+    auto channelName = text;
+    if (channelName.isEmpty()) {
+        if (bufferInfo.type() == BufferInfo::ChannelBuffer) {
+            channelName = bufferInfo.bufferName();
+        } else {
+            Client::messageModel()->insertErrorMessage(bufferInfo, tr("/JOIN expects a channel"));
+            return;
+        }
     }
-    switchBuffer(bufferInfo.networkId(), text.section(' ', 0, 0));
+    switchBuffer(bufferInfo.networkId(), channelName.section(' ', 0, 0));
     // send to core
-    defaultHandler("JOIN", bufferInfo, text);
+    defaultHandler("JOIN", bufferInfo, channelName);
 }
 
 void ClientUserInputHandler::handleQuery(const BufferInfo& bufferInfo, const QString& text)