Merged with trunk R861

Possible new bugs - not very thoroughly tested, but at least functional at first glance


git-svn-id: svn://localhost/ardour2/branches/midi@870 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 3 insertions, 4 deletions

diff --git a/libs/ardour/session_command.cc b/libs/ardour/session_command.cc
index 4e7c4151b7..fb15304e9f 100644
--- a/libs/ardour/session_command.cc
+++ b/libs/ardour/session_command.cc
@@ -13,9 +13,7 @@ using namespace PBD;
 
 namespace ARDOUR {
 
-static map<PBD::ID, Stateful*> registry;
-
-void Session::register_with_memento_command_factory(PBD::ID id, Stateful *ptr)
+void Session::register_with_memento_command_factory(PBD::ID id, StatefulDestructible *ptr)
 {
     registry[id] = ptr;
 }
@@ -90,7 +88,8 @@ Command *Session::memento_command_factory(XMLNode *n)
     }
     // For Editor and AutomationLine which are off-limits here
     else if (registry.count(id))
-        return new MementoCommand<Stateful>(*registry[id], before, after);
+        return new MementoCommand<StatefulDestructible>(*registry[id], before, after);
+
 
     /* we failed */
     error << _("could not reconstitute MementoCommand from XMLNode. id=") << id.to_s() << endmsg;