comparison base/CommandHistory.cpp @ 53:7fcdc6df4853

* Create a new time instants layer if Enter is hit when there is no existing time instants layer present
author Chris Cannam
date Mon, 20 Mar 2006 18:34:16 +0000
parents d397ea0a79f5
children c983dda79f72
comparison
equal deleted inserted replaced
52:d397ea0a79f5 53:7fcdc6df4853
225 { 225 {
226 if (!m_currentCompound) { 226 if (!m_currentCompound) {
227 std::cerr << "CommandHistory::endCompoundOperation: ERROR: no compound operation in progress!" << std::endl; 227 std::cerr << "CommandHistory::endCompoundOperation: ERROR: no compound operation in progress!" << std::endl;
228 } 228 }
229 229
230 Command *toAdd = m_currentCompound; 230 MacroCommand *toAdd = m_currentCompound;
231 m_currentCompound = 0; 231 m_currentCompound = 0;
232 232
233 // We don't execute the macro command here, because we have been 233 if (toAdd->haveCommands()) {
234 // executing the individual commands as we went along if 234
235 // m_executeCompound was true. 235 // We don't execute the macro command here, because we have
236 addCommand(toAdd, false); 236 // been executing the individual commands as we went along if
237 // m_executeCompound was true.
238 addCommand(toAdd, false);
239 }
237 } 240 }
238 241
239 void 242 void
240 CommandHistory::addExecutedCommand(Command *command) 243 CommandHistory::addExecutedCommand(Command *command)
241 { 244 {