From: Carl Hetherington Date: Wed, 3 Jun 2015 12:29:50 +0000 (+0100) Subject: Potentially nicer version of previous. X-Git-Tag: v2.0.48~10 X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=969ac273db1f660d6e5449b478a8135c432f7485;p=dcpomatic.git Potentially nicer version of previous. --- diff --git a/test/test.cc b/test/test.cc index 772504563..4eafe4ed0 100644 --- a/test/test.cc +++ b/test/test.cc @@ -288,6 +288,7 @@ wait_for_jobs () while (jm->work_to_do ()) { signal_manager->ui_idle (); } + if (jm->errors ()) { int N = 0; for (list >::iterator i = jm->_jobs.begin(); i != jm->_jobs.end(); ++i) { @@ -306,16 +307,11 @@ wait_for_jobs () } } - /* Wait for a little to make sure that examine-content jobs have had time to - signal the UI to do the content addition. - XXX: nasty - */ - dcpomatic_sleep (1); - signal_manager->ui_idle (); - /* Discard all jobs so we lose any we just reported an error in */ - JobManager::drop (); + if (jm->errors ()) { + JobManager::drop (); + } } void