From 318fb3a0694c6a3533cd6068069b3417c74c39e0 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 9 Jun 2009 21:17:12 +0000 Subject: Fix crash when loading broken sessions with invalid route IDs. git-svn-id: svn://localhost/ardour2/branches/3.0@5139 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/session_command.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libs/ardour/session_command.cc') diff --git a/libs/ardour/session_command.cc b/libs/ardour/session_command.cc index cf9cd6f7c9..828daf37bb 100644 --- a/libs/ardour/session_command.cc +++ b/libs/ardour/session_command.cc @@ -103,7 +103,9 @@ Session::memento_command_factory(XMLNode *n) return new MementoCommand(*(pl.get()), before, after); } } else if (obj_T == typeid (Route).name() || obj_T == typeid (AudioTrack).name() || obj_T == typeid(MidiTrack).name()) { - return new MementoCommand(*route_by_id(id), before, after); + if (boost::shared_ptr r = route_by_id(id)) { + return new MementoCommand(*r, before, after); + } } else if (obj_T == typeid (Evoral::Curve).name() || obj_T == typeid (AutomationList).name()) { std::map::iterator i = automation_lists.find(id); if (i != automation_lists.end()) { -- cgit v1.2.3