X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=f00cdfe28ae8ee910940c8d185f541a8cf146792;hb=d2bd0c628fd0616fe3b7dd02bd955b2c07ab48d5;hp=3f4bc6514048143df7f464280b3926d6ec9d4b5c;hpb=c138f4050bffbdc97edca8a824297f155dc62da3;p=dcpomatic.git

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 3f4bc6514..f00cdfe28 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -54,6 +54,7 @@ using std::exception;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::weak_ptr;
+using boost::optional;
 using dcp::Size;
 
 FilmViewer::FilmViewer (wxWindow* p)
@@ -385,23 +386,12 @@ FilmViewer::update_position_label ()
 }
 
 void
-FilmViewer::active_jobs_changed (bool a)
+FilmViewer::active_jobs_changed (optional<string> j)
 {
-	if (a) {
-		list<shared_ptr<Job> > jobs = JobManager::instance()->get ();
-		list<shared_ptr<Job> >::iterator i = jobs.begin ();
-		while (i != jobs.end() && boost::dynamic_pointer_cast<ExamineContentJob> (*i) == 0) {
-			++i;
-		}
-
-		if (i == jobs.end() || (*i)->finished()) {
-			/* no examine content job running, so we're ok to use the viewer */
-			a = false;
-		}
-	}
-
-	_slider->Enable (!a);
-	_play_button->Enable (!a);
+	/* examine content is the only job which stops the viewer working */
+	bool const a = !j || *j != "examine_content";
+	_slider->Enable (a);
+	_play_button->Enable (a);
 }
 
 void