Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove selection before container is deleted or it could cause a crash later.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2015-01-21 14:31:28 +00:00
parent 8af006cfd8
commit 4a5ae79a36
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/richtext/richtextbuffer.cpp
View File

@@ -11798,10 +11798,10 @@ bool wxRichTextAction::Do()
while (c) while (c)
{ {
if (c == container) if (c == container)
{
m_ctrl->StoreFocusObject(container); m_ctrl->StoreFocusObject(container);
break;
} if (m_ctrl && (c == m_ctrl->GetSelection().GetContainer()))
m_ctrl->SelectNone();
c = c->GetParent(); c = c->GetParent();
} }
} }
@@ -11979,10 +11979,10 @@ bool wxRichTextAction::Undo()
while (c) while (c)
{ {
if (c == container) if (c == container)
{
m_ctrl->StoreFocusObject(container); m_ctrl->StoreFocusObject(container);
break;
} if (m_ctrl && (c == m_ctrl->GetSelection().GetContainer()))
m_ctrl->SelectNone();
c = c->GetParent(); c = c->GetParent();
} }
} }