diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-02-27 19:01:38 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-02-27 19:01:38 +0000 |
| commit | 4822a75e4cf26019e839f17a2b5e3390aa00c205 (patch) | |
| tree | 37c21bffd4efd97857510ed6a9b8e458afe6b134 | |
| parent | 0d918f89811652f823b15b619d6a2e3382be0659 (diff) | |
fix #1497, related to lack of status.done setting when libsndfile craps out on us
git-svn-id: svn://localhost/ardour2/trunk@1528 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/editor_audio_import.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/import.cc | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index f3f8716c3f..57c0d00639 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -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 (); diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc index 643feb87ef..5c349c6ebe 100644 --- a/libs/ardour/import.cc +++ b/libs/ardour/import.cc @@ -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; } |