summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-10 17:40:56 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-10 17:40:56 +0000
commit6bd628dc57389286090e4b48c919aa314a1ea278 (patch)
treeca61243476c8e4c13c4c212499ab9dac412e6d9c /indra/newview
parent8419c4ec8aac52214a1a21bb3c00f4dc60fc8b6b (diff)
CID-93
Checker: FORWARD_NULL Function: LLFloaterPreference::onBtnOK() File: /indra/newview/llfloaterpreference.cpp
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfloaterpreference.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 9d9fbacee3..03555d4c4e 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -602,7 +602,7 @@ void LLFloaterPreference::onBtnOK()
if (hasFocus())
{
LLUICtrl* cur_focus = dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus());
- if (cur_focus->acceptsTextInput())
+ if (cur_focus && cur_focus->acceptsTextInput())
{
cur_focus->onCommit();
}