From df898c0e446c7056e80662f0bc91794bead25d4c Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sun, 11 Jun 2017 18:05:15 +0200 Subject: [PATCH] xcode 9 runtime checks showed nullptr access here in dialogs sample --- src/osx/carbon/statbrma.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/osx/carbon/statbrma.cpp b/src/osx/carbon/statbrma.cpp index 506e8a1671..76dc302dd4 100644 --- a/src/osx/carbon/statbrma.cpp +++ b/src/osx/carbon/statbrma.cpp @@ -155,7 +155,8 @@ void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event)) // that case, statusbar appearance shouldn't change. It also shouldn't // change if a window-modal sheet attached to this window is key. wxTopLevelWindow *tlw = wxDynamicCast(MacGetTopLevelWindow(), wxTopLevelWindow); - wxWindow *keyWindow = wxNonOwnedWindow::GetFromWXWindow(wxOSXGetKeyWindow())->MacGetTopLevelWindow(); + wxNonOwnedWindow* directKeyWindow = wxNonOwnedWindow::GetFromWXWindow(wxOSXGetKeyWindow()); + wxWindow *keyWindow = directKeyWindow ? directKeyWindow->MacGetTopLevelWindow() : NULL; while ( keyWindow && keyWindow != tlw ) { wxDialog *dlg = wxDynamicCast(keyWindow, wxDialog);