summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCinder <cinder@sdf.org>2014-10-23 12:45:05 -0600
committerCinder <cinder@sdf.org>2014-10-23 12:45:05 -0600
commit47854b621884a2504ae34ce72eabf57a7a946bfd (patch)
tree4be424da48c12d71f33c0edd62f887f6cbb238bb
parent920b6de4b1b2234b356258dc7ea1fb108d648cea (diff)
STORM-2081 - Guard against null gWindowImplementation when fullscreen (crashes OS X Yosemite)
-rwxr-xr-xindra/llwindow/llwindowmacosx.cpp5
1 files changed, 4 insertions, 1 deletions
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)