Error on incomplete MacroCmd key command
Jim Ramsay i.am@jimramsay.com
1 files changed,
9 insertions(+),
7 deletions(-)
jump to
M
src/FbTk/MacroCommand.cc
→
src/FbTk/MacroCommand.cc
@@ -33,16 +33,18 @@
template <typename M> M *addCommands(M *macro, const std::string &args, bool trusted) { - std::string blah; + std::string remainder; std::list<std::string> cmds; - StringUtil::stringTokensBetween(cmds, args, blah, '{', '}'); + StringUtil::stringTokensBetween(cmds, args, remainder, '{', '}'); RefCount<Command<void> > cmd(0); - std::list<std::string>::iterator it = cmds.begin(), it_end = cmds.end(); - for (; it != it_end; ++it) { - cmd = CommandParser<void>::instance().parse(*it, trusted); - if (*cmd) - macro->add(cmd); + if (remainder.length() == 0) { + std::list<std::string>::iterator it = cmds.begin(), it_end = cmds.end(); + for (; it != it_end; ++it) { + cmd = CommandParser<void>::instance().parse(*it, trusted); + if (*cmd) + macro->add(cmd); + } } if (macro->size() > 0)