Attempt to fix crash on hitting enter in the crop control on Windows (#1009).

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

diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 2d49ac4be583ee34e1ae45ffd7a11a7d3d23cd51..6da219f0f3dfeb16177c594dfc292f5f10bae7bf 100644 (file)
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -36,6 +36,7 @@
 #include "lib/ffmpeg_content.h"
 #include "lib/audio_content.h"
 #include <dcp/cpl.h>
+#include <dcp/exceptions.h>
 #include <wx/wx.h>
 #include <wx/dirdlg.h>
 #include <boost/foreach.hpp>
@@ -65,6 +66,7 @@ enum {
 ContentMenu::ContentMenu (wxWindow* p)
        : _menu (new wxMenu)
        , _parent (p)
+       , _pop_up_open (false)
 {
        _repeat = _menu->Append (ID_repeat, _("Repeat..."));
        _join = _menu->Append (ID_join, _("Join"));
@@ -79,27 +81,17 @@ ContentMenu::ContentMenu (wxWindow* p)
        _menu->AppendSeparator ();
        _remove = _menu->Append (ID_remove, _("Remove"));
 
-       _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::repeat, this), ID_repeat);
-       _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::join, this), ID_join);
-       _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::find_missing, this), ID_find_missing);
-       _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::properties, this), ID_properties);
-       _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::re_examine, this), ID_re_examine);
-       _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::kdm, this), ID_kdm);
-       _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::ov, this), ID_ov);
-       _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::remove, this), ID_remove);
-
+       _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::repeat, this), ID_repeat);
+       _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::join, this), ID_join);
+       _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::find_missing, this), ID_find_missing);
+       _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::properties, this), ID_properties);
+       _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::re_examine, this), ID_re_examine);
+       _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::kdm, this), ID_kdm);
+       _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::ov, this), ID_ov);
+       _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::remove, this), ID_remove);
        _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::cpl_selected, this, _1), 1, ID_repeat - 1);
 }
 
-ContentMenu::~ContentMenu ()
-{
-       delete _menu;
-
-       BOOST_FOREACH (boost::signals2::connection& i, _job_connections) {
-               i.disconnect ();
-       }
-}
-
 void
 ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList v, wxPoint p)
 {
@@ -132,21 +124,25 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList
                if (dcp) {
                        _kdm->Enable (dcp->encrypted ());
                        _ov->Enable (dcp->needs_assets ());
-                       DCPExaminer ex (dcp);
-                       list<shared_ptr<dcp::CPL> > cpls = ex.cpls ();
-                       _choose_cpl->Enable (cpls.size() > 1);
-                       /* We can't have 0 as a menu item ID on OS X */
-                       int id = 1;
-                       BOOST_FOREACH (shared_ptr<dcp::CPL> i, cpls) {
-                               wxMenuItem* item = _cpl_menu->AppendCheckItem (
-                                       id++,
-                                       wxString::Format (
-                                               "%s (%s)",
-                                               std_to_wx(i->annotation_text()).data(),
-                                               std_to_wx(i->id()).data()
-                                               )
-                                       );
-                               item->Check (dcp->cpl() && dcp->cpl() == i->id());
+                       try {
+                               DCPExaminer ex (dcp);
+                               list<shared_ptr<dcp::CPL> > cpls = ex.cpls ();
+                               _choose_cpl->Enable (cpls.size() > 1);
+                               /* We can't have 0 as a menu item ID on OS X */
+                               int id = 1;
+                               BOOST_FOREACH (shared_ptr<dcp::CPL> i, cpls) {
+                                       wxMenuItem* item = _cpl_menu->AppendCheckItem (
+                                               id++,
+                                               wxString::Format (
+                                                       "%s (%s)",
+                                                       std_to_wx(i->annotation_text()).data(),
+                                                       std_to_wx(i->id()).data()
+                                                       )
+                                               );
+                                       item->Check (dcp->cpl() && dcp->cpl() == i->id());
+                               }
+                       } catch (dcp::DCPReadError) {
+                               /* The DCP is probably missing */
                        }
                } else {
                        _kdm->Enable (false);
@@ -159,7 +155,9 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList
 
        _remove->Enable (!_content.empty ());
 
+       _pop_up_open = true;
        _parent->PopupMenu (_menu, p);
+       _pop_up_open = false;
 }
 
 void
@@ -311,15 +309,13 @@ ContentMenu::find_missing ()
 
        shared_ptr<Job> j (new ExamineContentJob (film, content));
 
-       _job_connections.push_back (
-               j->Finished.connect (
-                       bind (
-                               &ContentMenu::maybe_found_missing,
-                               this,
-                               boost::weak_ptr<Job> (j),
-                               boost::weak_ptr<Content> (_content.front ()),
-                               boost::weak_ptr<Content> (content)
-                               )
+       j->Finished.connect (
+               bind (
+                       &ContentMenu::maybe_found_missing,
+                       this,
+                       boost::weak_ptr<Job> (j),
+                       boost::weak_ptr<Content> (_content.front ()),
+                       boost::weak_ptr<Content> (content)
                        )
                );
 
@@ -416,6 +412,10 @@ ContentMenu::properties ()
 void
 ContentMenu::cpl_selected (wxCommandEvent& ev)
 {
+       if (!_pop_up_open) {
+               return;
+       }
+
        DCPOMATIC_ASSERT (!_content.empty ());
        shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (_content.front ());
        DCPOMATIC_ASSERT (dcp);