From 03d3147d32aa8636728f60f35db48d6b6b9414e0 Mon Sep 17 00:00:00 2001
From: Tim Mayberry <mojofunk@gmail.com>
Date: Thu, 15 Nov 2007 02:32:20 +0000
Subject: [PATCH] Check for cancel at the top of the main loop in
 Session::import_audiofile rather than using goto

git-svn-id: svn://localhost/ardour2/trunk@2672 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/ardour/import.cc | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc
index f2b5e9b790..4e759451c5 100644
--- a/libs/ardour/import.cc
+++ b/libs/ardour/import.cc
@@ -164,8 +164,10 @@ Session::import_audiofile (import_status& status)
 
 	status.sources.clear ();
 	
-	for (vector<Glib::ustring>::iterator p = status.paths.begin(); p != status.paths.end(); ++p, ++cnt) {
-
+	for (vector<Glib::ustring>::iterator p = status.paths.begin();
+			p != status.paths.end() && !status.cancel;
+			++p, ++cnt)
+	{
 		std::auto_ptr<ImportableSource> source;
 
 		try
@@ -229,10 +231,6 @@ Session::import_audiofile (import_status& status)
 		}
 	
 		std::copy (newfiles.begin(), newfiles.end(), std::back_inserter(status.sources));
-
-		if (status.cancel) {
-			goto out;
-		}
 	}
 	
 	if (!status.cancel) {