X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ftext_panel.cc;h=76dd21489f831b54c1a56a51a58f0d42eeb38ea4;hp=630ca6944e3da2ced3b33b502cd0dd96427331c6;hb=693013b77341e4177c792de091ab9a524e33c477;hpb=7aab34abcab28ca38a5354dec075b56d430e82db

diff --git a/src/wx/text_panel.cc b/src/wx/text_panel.cc
index 630ca6944..76dd21489 100644
--- a/src/wx/text_panel.cc
+++ b/src/wx/text_panel.cc
@@ -61,6 +61,9 @@ using std::string;
 using std::vector;
 using boost::bind;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 
 /** @param t Original text type of the content, if known */
@@ -809,13 +812,16 @@ TextPanel::try_to_load_analysis ()
 	}
 
 	_loading_analysis = true;
+	ScopeGuard sg = [this]() {
+		_loading_analysis = false;
+		setup_sensitivity();
+	};
+
 	setup_sensitivity ();
 	_analysis.reset ();
 
 	auto content = _analysis_content.lock ();
 	if (!content) {
-		_loading_analysis = false;
-		setup_sensitivity ();
 		return;
 	}
 
@@ -823,13 +829,13 @@ TextPanel::try_to_load_analysis ()
 
 	if (!boost::filesystem::exists(path)) {
 		for (auto i: JobManager::instance()->get()) {
-			if (dynamic_pointer_cast<AnalyseSubtitlesJob>(i)) {
+			if (dynamic_pointer_cast<AnalyseSubtitlesJob>(i) && !i->finished()) {
 				i->cancel ();
 			}
 		}
 
 		JobManager::instance()->analyse_subtitles (
-			_parent->film(), content, _analysis_finished_connection, bind(&TextPanel::analysis_finished, this)
+			_parent->film(), content, _analysis_finished_connection, bind(&TextPanel::analysis_finished, this, _1)
 			);
 		return;
 	}
@@ -839,14 +845,12 @@ TextPanel::try_to_load_analysis ()
 	} catch (OldFormatError& e) {
 		/* An old analysis file: recreate it */
 		JobManager::instance()->analyse_subtitles (
-			_parent->film(), content, _analysis_finished_connection, bind(&TextPanel::analysis_finished, this)
+			_parent->film(), content, _analysis_finished_connection, bind(&TextPanel::analysis_finished, this, _1)
 			);
 		return;
-        }
+	}
 
 	update_outline_subtitles_in_viewer ();
-	_loading_analysis = false;
-	setup_sensitivity ();
 }
 
 
@@ -883,27 +887,25 @@ TextPanel::clear_outline_subtitles ()
 
 
 void
-TextPanel::analysis_finished ()
+TextPanel::analysis_finished(Job::Result result)
 {
+	_loading_analysis = false;
+
 	auto content = _analysis_content.lock ();
-	if (!content) {
-		_loading_analysis = false;
-		setup_sensitivity ();
+	if (!content || result == Job::Result::RESULT_CANCELLED) {
+		clear_outline_subtitles();
+		setup_sensitivity();
 		return;
 	}
 
 	if (!boost::filesystem::exists(_parent->film()->subtitle_analysis_path(content))) {
-		/* We analysed and still nothing showed up, so maybe it was cancelled or it failed.
-		   Give up.
-		*/
+		/* We analysed and still nothing showed up, so maybe it failed.  Give up. */
 		error_dialog (_parent->window(), _("Could not analyse subtitles."));
 		clear_outline_subtitles ();
-		_loading_analysis = false;
 		setup_sensitivity ();
 		return;
 	}
 
-	_loading_analysis = false;
 	try_to_load_analysis ();
 }