From 8ed0d9e95ad82ff807ebeea582613a1c18705e35 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 27 Apr 2009 19:31:15 +0000 Subject: [PATCH] fix broken patch that caused crash when loading an older session without "default-type" property for each Route; don't call Session::fail_roll(), just no_roll() when stopping transport git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@5004 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/session_process.cc | 2 +- libs/ardour/session_state.cc | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc index 8d831ee40d..b607a43dbd 100644 --- a/libs/ardour/session_process.cc +++ b/libs/ardour/session_process.cc @@ -759,7 +759,7 @@ Session::process_without_events (nframes_t nframes) } if (maybe_stop (stop_limit)) { - fail_roll (nframes); + no_roll (nframes); return; } diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 73d8ba2921..f8e12e07b8 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -1359,10 +1359,12 @@ Session::load_routes (const XMLNode& node) set_dirty(); for (niter = nlist.begin(); niter != nlist.end(); ++niter) { - if ((*niter)->property ("default-type")->value() == "unknown" ) { - std::cout << "ignoring route with type unknown. (video-track)" << std::endl; - // Note: this may mess up remote_control IDs or more.. - continue; + XMLProperty* prop = (*niter)->property ("default-type"); + + if (prop && prop->value() == "unknown" ) { + std::cout << "ignoring route with type unknown. (video-track)" << std::endl; + // Note: this may mess up remote_control IDs or more.. + continue; } boost::shared_ptr route (XMLRouteFactory (**niter));