Skip to content

Commit

Permalink
scripting: added missing zero-pointer check in StateMachine::executeP…
Browse files Browse the repository at this point in the history
…reCheck()

See also commit f6c8c80 and #113.

Signed-off-by: Johannes Meyer <johannes@intermodalics.eu>
  • Loading branch information
meyerj committed Dec 6, 2016
1 parent 696ec41 commit f0abfa9
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions rtt/scripting/StateMachine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ namespace RTT {
}
else
{
TRACE("Transition triggered from '"+ (current ? current->getName() : "null") +"' to '"+(newState ? newState->getName() : "null")+"'.");
TRACE("Transition triggered from '"+ (current ? current->getName() : "(null)") +"' to '"+(newState ? newState->getName() : "(null)")+"'.");
// reset handle and run, in case it is still set ( during error
// or when an event arrived ).
//currentRun = 0;
Expand Down Expand Up @@ -1037,7 +1037,7 @@ namespace RTT {

// Run is executed before the transitions.
if ( currentRun ) {
TRACE("Executing run program of '"+ current->getName() +"'" );
TRACE("Executing run program of '"+ (current ? current->getName() : "(null)") +"'" );
if ( this->executeProgram(currentRun, stepping) == false )
return true;
// done.
Expand Down

0 comments on commit f0abfa9

Please sign in to comment.