Merged with trunk R879

git-svn-id: svn://localhost/ardour2/branches/midi@880 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 8 insertions, 6 deletions

diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc
index 14f67245fd..01c7182e14 100644
--- a/libs/ardour/import.cc
+++ b/libs/ardour/import.cc
@@ -306,14 +306,18 @@ Session::sample_rate_convert (import_status& status, string infile, string& outf
 	sf_count_t  input_count = 0;
 
 	SNDFILE* in = sf_open(infile.c_str(), SFM_READ, &sf_info);
+	if (!in) {
+		error << string_compose(_("Import/SRC: could not open input file: %1"), outfile) << endmsg;
+		return false;
+	}
 	sf_count_t total_input_frames = sf_info.frames;
 	
 	outfile = build_tmp_convert_name(infile);
 	SNDFILE* out = sf_open(outfile.c_str(), SFM_RDWR, &sf_info);
-	if(!out) {
-		error << string_compose(_("Import: could not open temp file: %1"), outfile) << endmsg;
-		return false;
-	}
+	if (!out) {
+		error << string_compose(_("Import/SRC: could not open output file: %1"), outfile) << endmsg;
+ 		return false;
+ 	}
 	
 	sf_seek (in, 0, SEEK_SET) ;
 	sf_seek (out, 0, SEEK_SET) ;
@@ -372,8 +376,6 @@ Session::sample_rate_convert (import_status& status, string infile, string& outf
 	sf_close(in);
 	sf_close(out);
 
-	status.done = true;
-
 	if (status.cancel) {
 		return false;
 	} else {