Basics of marker writing (part of #782).

[dcpomatic.git] / src / tools / dcpomatic_player.cc

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index b2f95a20f6f7c01a4052fe830ffe1828358c89df..7abc7c9219f0ee470ce739edc02c269030d5085d 100644 (file)
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -289,6 +289,9 @@ public:
        void playback_started (DCPTime time)
        {
                /* XXX: this only logs the first piece of content; probably should be each piece? */
+               if (_film->content().empty()) {
+                       return;
+               }
 
                shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent>(_film->content().front());
                if (dcp) {
@@ -848,6 +851,8 @@ private:
 
                int pos = _history_position;
 
+               /* Clear out non-existant history items before we re-build the menu */
+               Config::instance()->clean_player_history ();
                vector<boost::filesystem::path> history = Config::instance()->player_history ();
 
                if (!history.empty ()) {