From a8ebd6eebb9ec1e3d5f351452ea51ccade4d62e2 Mon Sep 17 00:00:00 2001 From: Shyotl Date: Tue, 19 Jun 2012 14:31:03 -0500 Subject: [PATCH] Fixed a nullptr that occasionally caused crashing on shutdown. --- indra/newview/llviewerwindow.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index c20231a49..5e6bb2bc0 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1183,7 +1183,8 @@ void LLViewerWindow::handleFocusLost(LLWindow *window) BOOL LLViewerWindow::handleTranslatedKeyDown(KEY key, MASK mask, BOOL repeated) { // Let the voice chat code check for its PTT key. Note that this never affects event processing. - gVoiceClient->keyDown(key, mask); + if(gVoiceClient) + gVoiceClient->keyDown(key, mask); if (gAwayTimer.getElapsedTimeF32() > MIN_AFK_TIME) {