diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-04-27 19:31:15 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-04-27 19:31:15 +0000 |
| commit | 8ed0d9e95ad82ff807ebeea582613a1c18705e35 (patch) | |
| tree | cbbda9a9b0c58606f24a3e41ead11e2df8ac1259 /libs/ardour/session_state.cc | |
| parent | 3fc1f9fb4cc7881087ed869809eff8c950b5e3c4 (diff) | |
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
Diffstat (limited to 'libs/ardour/session_state.cc')
| -rw-r--r-- | libs/ardour/session_state.cc | 10 |
1 files changed, 6 insertions, 4 deletions
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> route (XMLRouteFactory (**niter)); |