+2016-11-23 Carl Hetherington <cth@carlh.net>
+
+ * Fix crash on pressing enter in a crop control on Windows (#1009).
+
2016-11-16 Carl Hetherington <cth@carlh.net>
* Version 2.10.1 released.
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"));
_remove->Enable (!_content.empty ());
+ _pop_up_open = true;
_parent->PopupMenu (_menu, p);
+ _pop_up_open = false;
}
void
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);
/** Film that we are working with; set up by popup() */
boost::weak_ptr<Film> _film;
wxWindow* _parent;
+ bool _pop_up_open;
ContentList _content;
TimelineContentViewList _views;
wxMenuItem* _repeat;