fix some (all? not likely) problems with dragging close to 2^32-1 frames

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

1 files changed, 15 insertions, 10 deletions

diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index ad3077d9a0..3f9fa2737f 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -1675,20 +1675,25 @@ Route::_set_state (const XMLNode& node, bool call_base)
 		}
 	}
 
-	XMLNodeList redirect_nodes;
-			
-	for (niter = nlist.begin(); niter != nlist.end(); ++niter){
+	if (ports_legal) {
 
-		child = *niter;
+		/* if ports are not legal, this will happen in set_deferred_state() */
+
+		XMLNodeList redirect_nodes;
+		
+		for (niter = nlist.begin(); niter != nlist.end(); ++niter){
+			
+			child = *niter;
+			
+			if (child->name() == X_("Send") || child->name() == X_("Insert")) {
+				redirect_nodes.push_back(child);
+			}
 			
-		if (child->name() == X_("Send") || child->name() == X_("Insert")) {
-			redirect_nodes.push_back(child);
 		}
-
+		
+		_set_redirect_states (redirect_nodes);
 	}
 
-	_set_redirect_states(redirect_nodes);
-
 
 	for (niter = nlist.begin(); niter != nlist.end(); ++niter){
 		child = *niter;
@@ -1814,7 +1819,7 @@ Route::_set_redirect_states(const XMLNodeList &nlist)
 			--last;
 
 			if (prev_last == last) {
-				cerr << "Could not fully restore state as some redirects were not possible to create" << endl;
+				warning << _name << ": could not fully restore state as some redirects were not possible to create" << endmsg;
 				continue;
 
 			}