Fix various problems with the closed caption viewer not being updated properly.v2.15.91

1 files changed, 15 insertions, 2 deletions

diff --git a/src/wx/closed_captions_dialog.cc b/src/wx/closed_captions_dialog.cc
index afcf5fa87..625652b8c 100644
--- a/src/wx/closed_captions_dialog.cc
+++ b/src/wx/closed_captions_dialog.cc
@@ -205,6 +205,12 @@ ClosedCaptionsDialog::update ()
 		Refresh ();
 		_current_in_lines = true;
 	}
+
+	if (!_current && _tracks.empty()) {
+		for (int i = 0; i < CLOSED_CAPTION_LINES; ++i) {
+			_lines[i] = wxString();
+		}
+	}
 }
 
 void
@@ -215,8 +221,15 @@ ClosedCaptionsDialog::clear ()
 	Refresh ();
 }
 
+
+void
+ClosedCaptionsDialog::set_butler (weak_ptr<Butler> butler)
+{
+	_butler = butler;
+}
+
 void
-ClosedCaptionsDialog::set_film_and_butler (shared_ptr<Film> film, weak_ptr<Butler> butler)
+ClosedCaptionsDialog::update_tracks (shared_ptr<const Film> film)
 {
 	_tracks.clear ();
 
@@ -239,5 +252,5 @@ ClosedCaptionsDialog::set_film_and_butler (shared_ptr<Film> film, weak_ptr<Butle
 		_track->SetSelection (0);
 	}
 
-	_butler = butler;
+	track_selected ();
 }