ardour/livetrax
13
0
Fork 0
Code

Fix thinko in my previous commit. Should fix #3315.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7421 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-07-15 00:25:58 +00:00
parent 2091f8453b
commit 75c9d87051
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libs/pbd/pbd/memento_command.h
View File

@ -73,6 +73,7 @@ public:
} }
void object_died () { void object_died () {
/* The object we are binding died, so drop references to ourselves */
this->drop_references (); this->drop_references ();
} }
@ -92,13 +93,15 @@ public:
MementoCommand (obj_T& a_object, XMLNode* a_before, XMLNode* a_after) MementoCommand (obj_T& a_object, XMLNode* a_before, XMLNode* a_after)
: _binder (new SimpleMementoCommandBinder<obj_T> (a_object)), before (a_before), after (a_after) : _binder (new SimpleMementoCommandBinder<obj_T> (a_object)), before (a_before), after (a_after)
{ {
_binder->Destroyed.connect_same_thread (_binder_death_connection, boost::bind (&MementoCommand::binder_died, this)); /* The binder's object died, so we must die */
_binder->DropReferences.connect_same_thread (_binder_death_connection, boost::bind (&MementoCommand::binder_dying, this));
} }
MementoCommand (MementoCommandBinder<obj_T>* b, XMLNode* a_before, XMLNode* a_after) MementoCommand (MementoCommandBinder<obj_T>* b, XMLNode* a_before, XMLNode* a_after)
: _binder (b), before (a_before), after (a_after) : _binder (b), before (a_before), after (a_after)
{ {
_binder->Destroyed.connect_same_thread (_binder_death_connection, boost::bind (&MementoCommand::binder_died, this)); /* The binder's object died, so we must die */
_binder->DropReferences.connect_same_thread (_binder_death_connection, boost::bind (&MementoCommand::binder_dying, this));
} }
~MementoCommand () { ~MementoCommand () {
@ -108,7 +111,7 @@ public:
delete _binder; delete _binder;
} }
void binder_died () { void binder_dying () {
delete this; delete this;
} }