ardour/livetrax
13
0
Fork 0
Code

fix #1497, related to lack of status.done setting when libsndfile craps out on us

Browse Source 
git-svn-id: svn://localhost/ardour2/trunk@1528 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2007-02-27 19:01:38 +00:00
parent 0d918f8981
commit 4822a75e4c
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/editor_audio_import.cc
View File

@ -244,6 +244,8 @@ Editor::import_sndfile (vector<ustring> paths, ImportMode mode, AudioTrack* trac
while (!(import_status.done || import_status.cancel)) {
gtk_main_iteration ();
}
interthread_progress_window->hide ();
import_status.done = true;
interthread_progress_connection.disconnect ();

2
libs/ardour/import.cc
View File

@ -132,6 +132,8 @@ Session::import_audiofile (import_status& status)
if ((in = sf_open (status.paths.front().c_str(), SFM_READ, &info)) == 0) {
error << string_compose(_("Import: cannot open input sound file \"%1\""), status.paths.front()) << endmsg;
status.done = 1;
status.cancel = 1;
return -1;
}