X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fclosed_captions_dialog.cc;h=666547d16b5f00dad69aa65180566e67eb96d98d;hb=ed94e34207c9d8dbd495ca4b0ef468b79126f26a;hp=625652b8c30d2a4dc6dde2326b6ea8b0cfd43134;hpb=d902160e3c89a9f65f58a2463fac0b1de1d940b1;p=dcpomatic.git

diff --git a/src/wx/closed_captions_dialog.cc b/src/wx/closed_captions_dialog.cc
index 625652b8c..666547d16 100644
--- a/src/wx/closed_captions_dialog.cc
+++ b/src/wx/closed_captions_dialog.cc
@@ -60,7 +60,7 @@ ClosedCaptionsDialog::ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer
 	wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
 
 	wxBoxSizer* track_sizer = new wxBoxSizer (wxHORIZONTAL);
-	add_label_to_sizer (track_sizer, this, _("Track"), true);
+	add_label_to_sizer (track_sizer, this, _("Track"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 	track_sizer->Add (_track, 0, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_X_GAP);
 
 	sizer->Add (track_sizer, 0, wxALL, DCPOMATIC_SIZER_GAP);
@@ -165,22 +165,23 @@ ClosedCaptionsDialog::update ()
 	if (!_current && !_tracks.empty()) {
 		/* We have no current one: get another */
 		shared_ptr<Butler> butler = _butler.lock ();
-		DCPOMATIC_ASSERT (butler);
 		DCPOMATIC_ASSERT (_track->GetSelection() >= 0);
 		DCPOMATIC_ASSERT (_track->GetSelection() < int(_tracks.size()));
 		DCPTextTrack track = _tracks[_track->GetSelection()];
-		while (true) {
-			optional<TextRingBuffers::Data> d = butler->get_closed_caption ();
-			if (!d) {
-				break;
-			}
-			if (d->track == track) {
-				_current = d;
-				break;
+		if (butler) {
+			while (true) {
+				optional<TextRingBuffers::Data> d = butler->get_closed_caption ();
+				if (!d) {
+					break;
+				}
+				if (d->track == track) {
+					_current = d;
+					break;
+				}
 			}
-		}
 
-		_current_in_lines = false;
+			_current_in_lines = false;
+		}
 	}
 
 	if (_current && _current->period.contains(time)) {