Changeset 7270 for code/branches/consolecommands3/src/libraries/core/command/ConsoleCommand.cc

Timestamp:

Aug 30, 2010, 7:52:33 PM (14 years ago)

Author:

landauf

Message:

pushFunction() (which explicitly adds a new level to the console command stack) was not forwarded to ConsoleCommandManipulator

also fixed a bug which was caused by pushFunction() with a subsequent call to setFunction(…) because it may have unexpectedly changed the functor of the lower stack levels. now pushFunction() not only copyconstructs the executor, but also the Functor (with a clone() function)

File:

• code/branches/consolecommands3/src/libraries/core/command/ConsoleCommand.cc (modified) (2 diffs)

code/branches/consolecommands3/src/libraries/core/command/ConsoleCommand.cc

@@ -193 +193 @@
     {
         Command command;
-        command.executor_ = this->getExecutor();
+        command.executor_ = this->executor_;
         if (command.executor_)
-            command.functor_ = this->getExecutor()->getFunctor();
+            command.functor_ = this->executor_->getFunctor();
 
         if (this->setFunction(executor, bForce))
@@ -204 +204 @@
     {
         Command command;
-        command.executor_ = this->getExecutor();
+        command.executor_ = this->executor_;
         if (command.executor_)
-            command.functor_ = this->getExecutor()->getFunctor();
+            command.functor_ = this->executor_->getFunctor();
 
         if (this->setFunction(functor, bForce))