X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ftext_panel.cc;h=2fdcbb51f5d03733abdbce3d9950d5c1ad089acd;hp=94ec8506d65366395a12d592cf0960f6d5b771cc;hb=c7044a1b444c2e5e7659bf5d34ed5ac73f5a6271;hpb=4e4968464eeef1956cb82392e1fc3b27a792ab89

diff --git a/src/wx/text_panel.cc b/src/wx/text_panel.cc
index 94ec8506d..2fdcbb51f 100644
--- a/src/wx/text_panel.cc
+++ b/src/wx/text_panel.cc
@@ -735,18 +735,13 @@ TextPanel::content_selection_changed ()
 void
 TextPanel::text_view_clicked ()
 {
-	if (_text_view) {
-		_text_view->Destroy ();
-		_text_view = nullptr;
-	}
-
 	auto c = _parent->selected_text ();
 	DCPOMATIC_ASSERT (c.size() == 1);
 
 	auto decoder = decoder_factory (_parent->film(), c.front(), false, false, shared_ptr<Decoder>());
 
 	if (decoder) {
-		_text_view = new TextView (this, _parent->film(), c.front(), c.front()->text_of_original_type(_original_type), decoder, _parent->film_viewer());
+		_text_view.reset(this, _parent->film(), c.front(), c.front()->text_of_original_type(_original_type), decoder, _parent->film_viewer());
 		_text_view->Show ();
 	}
 }
@@ -755,15 +750,10 @@ TextPanel::text_view_clicked ()
 void
 TextPanel::fonts_dialog_clicked ()
 {
-	if (_fonts_dialog) {
-		_fonts_dialog->Destroy ();
-		_fonts_dialog = nullptr;
-	}
-
 	auto c = _parent->selected_text ();
 	DCPOMATIC_ASSERT (c.size() == 1);
 
-	_fonts_dialog = new FontsDialog (this, c.front(), c.front()->text_of_original_type(_original_type));
+	_fonts_dialog.reset(this, c.front(), c.front()->text_of_original_type(_original_type));
 	_fonts_dialog->Show ();
 }
 
@@ -791,11 +781,10 @@ TextPanel::appearance_dialog_clicked ()
 	auto c = _parent->selected_text ();
 	DCPOMATIC_ASSERT (c.size() == 1);
 
-	auto d = new SubtitleAppearanceDialog (this, _parent->film(), c.front(), c.front()->text_of_original_type(_original_type));
-	if (d->ShowModal () == wxID_OK) {
-		d->apply ();
+	SubtitleAppearanceDialog dialog(this, _parent->film(), c.front(), c.front()->text_of_original_type(_original_type));
+	if (dialog.ShowModal() == wxID_OK) {
+		dialog.apply();
 	}
-	d->Destroy ();
 }
 
 
@@ -820,13 +809,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;
 	}
 
@@ -834,7 +826,7 @@ 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 ();
 			}
 		}
@@ -853,11 +845,9 @@ TextPanel::try_to_load_analysis ()
 			_parent->film(), content, _analysis_finished_connection, bind(&TextPanel::analysis_finished, this)
 			);
 		return;
-        }
+	}
 
 	update_outline_subtitles_in_viewer ();
-	_loading_analysis = false;
-	setup_sensitivity ();
 }
 
 
@@ -896,9 +886,10 @@ TextPanel::clear_outline_subtitles ()
 void
 TextPanel::analysis_finished ()
 {
+	_loading_analysis = false;
+
 	auto content = _analysis_content.lock ();
 	if (!content) {
-		_loading_analysis = false;
 		setup_sensitivity ();
 		return;
 	}
@@ -909,12 +900,10 @@ TextPanel::analysis_finished ()
 		*/
 		error_dialog (_parent->window(), _("Could not analyse subtitles."));
 		clear_outline_subtitles ();
-		_loading_analysis = false;
 		setup_sensitivity ();
 		return;
 	}
 
-	_loading_analysis = false;
 	try_to_load_analysis ();
 }