From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Wed, 31 Dec 2008 00:12:48 +0000 (+0100)
Subject: fixing a bug related to wait in combination with aliases that expand to multiple... 
X-Git-Tag: 0.4.0~300
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=1083b65ff728a303caf700adf4179f337c6528fe;ds=sidebyside

fixing a bug related to wait in combination with aliases that expand to multiple commands
---

diff --git a/src/core/userinputhandler.cpp b/src/core/userinputhandler.cpp
index 4b4c0796..de56d85b 100644
--- a/src/core/userinputhandler.cpp
+++ b/src/core/userinputhandler.cpp
@@ -504,7 +504,14 @@ void UserInputHandler::timerEvent(QTimerEvent *event) {
     QObject::timerEvent(event);
     return;
   }
-  Command command = _delayedCommands.take(event->timerId());
+  BufferInfo bufferInfo = _delayedCommands[event->timerId()].bufferInfo;
+  QString rawCommand = _delayedCommands[event->timerId()].command;
+  _delayedCommands.remove(event->timerId());
   event->accept();
-  handleUserInput(command.bufferInfo, command.command);
+
+  // the stored command might be the result of an alias expansion, so we need to split it up again
+  QStringList commands = rawCommand.split(QRegExp("; ?"));
+  foreach(QString command, commands) {
+    handleUserInput(bufferInfo, command);
+  }
 }