Fix crash when pressing Ctrl+T with no content (#2563).

[dcpomatic.git] / src / wx / content_panel.cc

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 0cbb62b54d3744154c079cae22f313d8cba3cb42..5fa935fac3708b4052de4d6516565402007a21ab 100644 (file)
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -30,7 +30,6 @@
 #include "timeline_dialog.h"
 #include "timing_panel.h"
 #include "video_panel.h"
-#include "wx_ptr.h"
 #include "wx_util.h"
 #include "lib/audio_content.h"
 #include "lib/case_insensitive_sorter.h"
@@ -259,7 +258,7 @@ ContentPanel::ContentPanel(wxNotebook* n, shared_ptr<Film> film, FilmViewer& vie
                auto b = new wxBoxSizer (wxVERTICAL);
 
                _add_file = new Button (_top_panel, _("Add file(s)..."));
-               _add_file->SetToolTip (_("Add video, image, sound or subtitle files to the film."));
+               _add_file->SetToolTip(_("Add video, image, sound or subtitle files to the film (Ctrl+A)."));
                b->Add (_add_file, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
 
                _add_folder = new Button (_top_panel, _("Add folder..."));
@@ -271,7 +270,7 @@ ContentPanel::ContentPanel(wxNotebook* n, shared_ptr<Film> film, FilmViewer& vie
                b->Add (_add_dcp, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
 
                _remove = new Button (_top_panel, _("Remove"));
-               _remove->SetToolTip (_("Remove the selected piece of content from the film."));
+               _remove->SetToolTip(_("Remove the selected piece of content from the film (Delete)."));
                b->Add (_remove, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
 
                _earlier = new Button (_top_panel, _("Earlier"));
@@ -283,7 +282,7 @@ ContentPanel::ContentPanel(wxNotebook* n, shared_ptr<Film> film, FilmViewer& vie
                b->Add (_later, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
 
                _timeline = new Button (_top_panel, _("Timeline..."));
-               _timeline->SetToolTip (_("Open the timeline for the film."));
+               _timeline->SetToolTip(_("Open the timeline for the film (Ctrl+T)."));
                b->Add (_timeline, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
 
                s->Add (b, 0, wxALL, 4);
@@ -715,7 +714,7 @@ ContentPanel::remove_clicked (bool hotkey)
 void
 ContentPanel::timeline_clicked ()
 {
-       if (!_film) {
+       if (!_film || _film->content().empty()) {
                return;
        }