diff options
| author | Frank Herchet <frank.fh.herchet@bmw.de> | 2012-02-17 09:08:31 +0100 |
|---|---|---|
| committer | Frank Herchet <frank.fh.herchet@bmw.de> | 2012-02-17 09:08:31 +0100 |
| commit | d5bd9a2a3c8911d5fcec6235fa72008860f74cde (patch) | |
| tree | d6ce99f231cc40a17f14b26eb9b24863f4e7e218 | |
| parent | 6d3b9a654d55e3d04c846baf4e24eb77c5bb0671 (diff) | |
| download | audiomanager-d5bd9a2a3c8911d5fcec6235fa72008860f74cde.tar.gz | |
* fix reset of 'conn' command if number of arguments < 2
| -rw-r--r-- | AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
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<std::string> & 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; } |