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

fix an crash that caused by accessing an non-existing tabbar

Browse Source
This commit is contained in:
Jinhao 2015-09-22 21:05:50 +08:00
parent 8dcd730715
commit ccb334a907
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/gui/place_parts.hpp
View File

@ -206,16 +206,15 @@ namespace nana
caption_.create(*this, true); caption_.create(*this, true);
caption_.on_close([this] caption_.on_close([this]
{ {
bool destroy_dockarea = false; bool destroy_dockarea = true;
try
if (tabbar_)
{ {
tabbar_->erase(tabbar_->selected()); tabbar_->erase(tabbar_->selected());
destroy_dockarea = (0 == tabbar_->length()); destroy_dockarea = (0 == tabbar_->length());
} }
catch (std::out_of_range&)
{
destroy_dockarea = true;
}
if (destroy_dockarea) if (destroy_dockarea)
notifier_->request_close(); notifier_->request_close();

2
source/gui/widgets/tabbar.cpp
View File

@ -1684,7 +1684,7 @@ namespace nana
if (close_attached && attached_wd) if (close_attached && attached_wd)
API::close_window(attached_wd); API::close_window(attached_wd);
if (selection_changed) if (selection_changed && (active_pos != npos))
{ {
event_arg arg; event_arg arg;
events().selected.emit(arg); events().selected.emit(arg);