X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.cc;h=70364106cae7aabb22e8eb589569f3bec516d3a8;hp=6bcffd37772ecf44d724200ca1ee86514f16c73d;hb=507a389e9c5f84ec1d51e7566e38fbf42f658537;hpb=0a83994b5308cadc36e08d944bc65c2aef84449e

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 6bcffd377..70364106c 100644
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -28,7 +28,7 @@
 #include "image_sequence_dialog.h"
 #include "film_viewer.h"
 #include "lib/audio_content.h"
-#include "lib/subtitle_content.h"
+#include "lib/text_content.h"
 #include "lib/video_content.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/content_factory.h"
@@ -39,8 +39,8 @@
 #include "lib/config.h"
 #include "lib/log.h"
 #include "lib/compose.hpp"
-#include "lib/text_subtitle_content.h"
-#include "lib/text_subtitle.h"
+#include "lib/plain_text_file_content.h"
+#include "lib/plain_text_file.h"
 #include <wx/wx.h>
 #include <wx/notebook.h>
 #include <wx/listctrl.h>
@@ -258,11 +258,11 @@ ContentPanel::selection_changed ()
 	BOOST_FOREACH (shared_ptr<Content> i, selected ()) {
 		DCPTime p;
 		p = i->position();
-		if (dynamic_pointer_cast<TextSubtitleContent>(i)) {
+		if (dynamic_pointer_cast<PlainTextFileContent>(i) && i->paths_valid()) {
 			/* Rather special case; if we select a text subtitle file jump to its
 			   first subtitle.
 			*/
-			TextSubtitle ts (dynamic_pointer_cast<TextSubtitleContent>(i));
+			PlainTextFile ts (dynamic_pointer_cast<PlainTextFileContent>(i));
 			if (ts.first()) {
 				p += DCPTime(ts.first().get(), _film->active_frame_rate_change(i->position()));
 			}
@@ -409,6 +409,10 @@ ContentPanel::remove_clicked (bool hotkey)
 void
 ContentPanel::timeline_clicked ()
 {
+	if (!_film) {
+		return;
+	}
+
 	if (_timeline_dialog) {
 		_timeline_dialog->Destroy ();
 		_timeline_dialog = 0;