fix broken patch that caused crash when loading an older session without "default...

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@5004 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc
index 8d831ee40d31bcacb4f5fbe895408e3b2e98e3da..b607a43dbd7cc571c30290a3829e7fea064b6d71 100644 (file)
--- 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 73d8ba2921146fda7b6336129c79d114bdfbdb70..f8e12e07b82384ed129091c6f9998db10850cb9e 100644 (file)
--- 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));