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

fix a crash

Browse Source 
a crash caused by a splitbar would be created by place when the window is
destorying; add some checks whether the parent is destorying in create
widget functions
This commit is contained in:
Jinhao
2015-08-08 08:25:55 +08:00
parent 1600d73856
commit ff7a1f9510
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/gui/place.cpp
View File

@@ -776,10 +776,13 @@ namespace nana
//It will delete the element and recollocate when the window destroyed.
event_handle _m_make_destroy(window wd)
{
return API::events(wd).destroy.connect([this](const arg_destroy& arg)
return API::events(wd).destroy.connect([this, wd](const arg_destroy& arg)
{
if (erase_element(elements, arg.window_handle))
place_ptr_->collocate();
{
if (!API::is_destroying(API::get_parent_window(wd)))
place_ptr_->collocate();
}
});
}
@@ -1524,6 +1527,9 @@ namespace nana
private:
void collocate(window wd) override
{
if (API::is_destroying(wd))
return;
if (splitter_.empty())
{
splitter_.create(wd);