From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 1 Oct 2012 09:55:27 +0000 (+0000)
Subject: Test for wxAuiMDIClientWindow being non-NULL before using it.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/91ad3a26e39458e6fcd593165ad0a7aaccbe86a1

Test for wxAuiMDIClientWindow being non-NULL before using it.

wxAuiMDIParentFrame::GetActiveChild() may be called before the client window
is created, don't crash in this case but just return NULL.

Closes #14684.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/aui/tabmdi.cpp b/src/aui/tabmdi.cpp
index 13dc090b01..edf19a97be 100644
--- a/src/aui/tabmdi.cpp
+++ b/src/aui/tabmdi.cpp
@@ -244,14 +244,18 @@ bool wxAuiMDIParentFrame::ProcessEvent(wxEvent& event)
 
 wxAuiMDIChildFrame *wxAuiMDIParentFrame::GetActiveChild() const
 {
-    return GetClientWindow()->GetActiveChild();
+    // We can be called before the client window is created, so check for its
+    // existence.
+    wxAuiMDIClientWindow* const client = GetClientWindow();
+    return client ? client->GetActiveChild() : NULL;
 }
 
 void wxAuiMDIParentFrame::SetActiveChild(wxAuiMDIChildFrame* pChildFrame)
 {
-    if (GetClientWindow()->GetActiveChild() != pChildFrame)
+    wxAuiMDIClientWindow* const client = GetClientWindow();
+    if (client && client->GetActiveChild() != pChildFrame)
     {
-        GetClientWindow()->SetActiveChild(pChildFrame);
+        client->SetActiveChild(pChildFrame);
     }
 }