From 47854b621884a2504ae34ce72eabf57a7a946bfd Mon Sep 17 00:00:00 2001 From: Cinder Date: Thu, 23 Oct 2014 12:45:05 -0600 Subject: STORM-2081 - Guard against null gWindowImplementation when fullscreen (crashes OS X Yosemite) --- indra/llwindow/llwindowmacosx.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/llwindow') diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index 18d5152015..3d2349f379 100755 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -230,7 +230,10 @@ void callFocus() void callFocusLost() { - gWindowImplementation->getCallbacks()->handleFocusLost(gWindowImplementation); + if (gWindowImplementation) + { + gWindowImplementation->getCallbacks()->handleFocusLost(gWindowImplementation); + } } void callRightMouseDown(float *pos, MASK mask) -- cgit v1.2.3