# # # patch "src/model/AutomateCommand.cpp" # from [4ce7f2845e63e78b9227cb9360e05f20608a27d9] # to [cb33a7922177d9b07d46bc81ecc1453f92c96c8e] # ============================================================ --- src/model/AutomateCommand.cpp 4ce7f2845e63e78b9227cb9360e05f20608a27d9 +++ src/model/AutomateCommand.cpp cb33a7922177d9b07d46bc81ecc1453f92c96c8e @@ -55,6 +55,12 @@ void AutomateCommand::enqueueTask(Monoto connectedThreads.append(threadNumber); } + + if (!queuedCommands.contains(threadNumber)) + { + queuedCommands.insert(threadNumber, QList()); + } + queuedCommands[threadNumber].append( thread->enqueueTask(task) ); @@ -80,10 +86,10 @@ void AutomateCommandHelper::taskAborted( { // do sth more reasonable here in a subclass, // i.e. try to query the data again - C(QString("Task %1 (thread %2) aborted (%3)") + C(QString("Task %1 (%2) aborted: %3") .arg(task.getCommandNumber()) - .arg(task.getThreadNumber()) .arg(QString::fromUtf8(task.getEncodedInput())) + .arg(task.getOutputUtf8()) ); } @@ -93,7 +99,7 @@ void AutomateCommandHelper::taskFinished int cmdNumber = task.getCommandNumber(); if (!command->queuedCommands.contains(threadNumber) || - command->queuedCommands[threadNumber].contains(cmdNumber)) + !command->queuedCommands[threadNumber].contains(cmdNumber)) { return; }