From d5bd9a2a3c8911d5fcec6235fa72008860f74cde Mon Sep 17 00:00:00 2001 From: Frank Herchet Date: Fri, 17 Feb 2012 09:08:31 +0100 Subject: * fix reset of 'conn' command if number of arguments < 2 --- AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp') diff --git a/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp b/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp index eca274b..3e79da0 100644 --- a/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp +++ b/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp @@ -42,10 +42,9 @@ using namespace am; CAmTelnetMenuHelper* CAmTelnetMenuHelper::instance = NULL; /****************************************************************************/ -CAmTelnetMenuHelper::CAmTelnetMenuHelper(SocketHandler *iSocketHandler, CommandSender *iCommandSender, CommandReceiver *iCommandReceiver, RoutingSender *iRoutingSender, RoutingReceiver *iRoutingReceiver, ControlSender *iControlSender, ControlReceiver *iControlReceiver, DatabaseHandler *iDatabasehandler, Router *iRouter) +CAmTelnetMenuHelper::CAmTelnetMenuHelper(SocketHandler *iSocketHandler, CommandSender *iCommandSender, CommandReceiver *iCommandReceiver, RoutingSender *iRoutingSender, RoutingReceiver *iRoutingReceiver, ControlSender *iControlSender, ControlReceiver *iControlReceiver, DatabaseHandler *iDatabasehandler, Router *iRouter, TelnetServer *iTelnetServer) /****************************************************************************/ -: - mTelenetServer(NULL), mSocketHandler(iSocketHandler), mCommandSender(iCommandSender), mCommandReceiver(iCommandReceiver), mRoutingSender(iRoutingSender), mRoutingReceiver(iRoutingReceiver), mControlSender(iControlSender), mControlReceiver(iControlReceiver), mDatabasehandler(iDatabasehandler), mRouter(iRouter) +:mTelenetServer(iTelnetServer), mSocketHandler(iSocketHandler), mCommandSender(iCommandSender), mCommandReceiver(iCommandReceiver), mRoutingSender(iRoutingSender), mRoutingReceiver(iRoutingReceiver), mControlSender(iControlSender), mControlReceiver(iControlReceiver), mDatabasehandler(iDatabasehandler), mRouter(iRouter) { instance = this; createCommandMaps(); @@ -917,7 +916,10 @@ void CAmTelnetMenuHelper::setConnectionExec(std::queue & CmdQueue, } else { - CmdQueue.pop(); + // remove 1 element if list is not empty + if(!CmdQueue.empty()) + CmdQueue.pop(); + sendError(filedescriptor, "Not enough arguments to set routing. Please enter sourceID and sinkID after command"); return; } -- cgit v1.2.1