summaryrefslogtreecommitdiff
path: root/src/wx
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-03-23 00:44:59 +0000
committerCarl Hetherington <cth@carlh.net>2018-03-23 00:44:59 +0000
commite2361edc2fc2c07d6474bf5a7f76dc2a5b55ee81 (patch)
tree9428755e228b97249fa1aab0ec20d08653fb379f /src/wx
parentf20f6531533c7dda18e4d916feb6a4294702aa76 (diff)
Ctrl-T to open timeline (#1201).
Diffstat (limited to 'src/wx')
-rw-r--r--src/wx/content_panel.cc4
-rw-r--r--src/wx/content_panel.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 6bcffd377..1680e5926 100644
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -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;
diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h
index 475567d28..15e0fb6e1 100644
--- a/src/wx/content_panel.h
+++ b/src/wx/content_panel.h
@@ -69,6 +69,7 @@ public:
void add_file_clicked ();
bool remove_clicked (bool hotkey);
+ void timeline_clicked ();
boost::signals2::signal<void (void)> SelectionChanged;
@@ -80,7 +81,6 @@ private:
void later_clicked ();
void right_click (wxListEvent &);
void files_dropped (wxDropFilesEvent &);
- void timeline_clicked ();
void setup ();
void setup_sensitivity ();