From 74c69114bc99fceff7e59c51d5bbd7b18949e8dd Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 29 Sep 2010 22:59:39 +0000 Subject: Fix confusion about the 'done' variable in InterThreadInfo during import. 'done' now means that a given run of the import thread has completed; 'all_done' means that the whole import operation has completed. Fixes #3396. git-svn-id: svn://localhost/ardour2/branches/3.0@7862 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/interthread_progress_window.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gtk2_ardour/interthread_progress_window.cc') diff --git a/gtk2_ardour/interthread_progress_window.cc b/gtk2_ardour/interthread_progress_window.cc index 7de3fd2b4d..6cd1d8686a 100644 --- a/gtk2_ardour/interthread_progress_window.cc +++ b/gtk2_ardour/interthread_progress_window.cc @@ -100,6 +100,6 @@ ImportProgressWindow::update () } _bar.set_text (string_compose (_("Importing file: %1 of %2"), c, _import_status->total)); - - return !(_import_status->done || _import_status->cancel); + + return !(_import_status->all_done || _import_status->cancel); } -- cgit v1.2.3