summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-06-03 13:29:50 +0100
committerCarl Hetherington <cth@carlh.net>2015-06-03 13:29:50 +0100
commit969ac273db1f660d6e5449b478a8135c432f7485 (patch)
treeebb5cc8e48e9c3ee71ea19176a4f2d3464c3bb51
parent84c0f9cdd9ca2b35d61b09c471b64bb2de738f12 (diff)
Potentially nicer version of previous.
-rw-r--r--test/test.cc12
1 files changed, 4 insertions, 8 deletions
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<shared_ptr<Job> >::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