mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix crash where select menu command using keyboard(#237)

Browse Source
This commit is contained in:
Jinhao 2017-08-03 05:42:32 +08:00
parent 12843da679
commit 7b12dafb19
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/gui/widgets/menu.cpp
View File

@ -624,10 +624,14 @@ namespace nana
} }
else if (item_ptr->flags.enabled) else if (item_ptr->flags.enabled)
{ {
//A pointer refers to a menu object which owns the menu window.
//After fn_close_tree_(), *this is an invalid object.
auto owner = menu_->owner;
fn_close_tree_(); fn_close_tree_();
if (item_ptr->event_handler) if (item_ptr->event_handler)
{ {
item_proxy ip{ index, menu_->owner }; item_proxy ip{ index, owner };
item_ptr->event_handler.operator()(ip); item_ptr->event_handler.operator()(ip);
} }
return 1; return 1;
@ -1019,13 +1023,18 @@ namespace nana
close(); close();
break; break;
default: default:
if (2 != send_shortkey(arg.key)) switch (send_shortkey(arg.key))
{ {
if (API::empty_window(*this) == false) case 0:
if (this->empty() == false)
close(); close();
} break;
else case 1: //The menu has been closed
break;
case 2:
this->submenu(true); this->submenu(true);
break;
}
} }
} }