From bcd511aa3fec59e1527c8b7ab80dabda4db1a6f9 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 25 Oct 2006 20:11:42 +0000 Subject: fixes for endemic (compiler?) issues with virtual inheritance of sigc::trackable. NOTE: automation list undo/redo no longer operational, fix to follow git-svn-id: svn://localhost/ardour2/trunk@1007 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/session_state.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libs/ardour/session_state.cc') diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index c3e0fe9388..d742186d6b 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -243,7 +243,7 @@ Session::first_stage_init (string fullpath, string snapshot_name) Curve::CurveCreated.connect (mem_fun (*this, &Session::add_curve)); AutomationList::AutomationListCreated.connect (mem_fun (*this, &Session::add_automation_list)); - Controllable::GoingAway.connect (mem_fun (*this, &Session::remove_controllable)); + Controllable::Destroyed.connect (mem_fun (*this, &Session::remove_controllable)); IO::MoreOutputs.connect (mem_fun (*this, &Session::ensure_passthru_buffers)); @@ -1147,7 +1147,9 @@ Session::set_state (const XMLNode& node) start_location = location; } +#ifdef STATE_MANAGER _locations.save_state (_("initial state")); +#endif if ((child = find_named_node (node, "EditGroups")) == 0) { error << _("Session: XML state has no edit groups section") << endmsg; -- cgit v1.2.3