diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-10 17:42:07 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-10 17:42:07 +0000 |
| commit | 8fec8c46df9533c30bf97bc6da0f1f8701c440e9 (patch) | |
| tree | 96eeba5242588f26ad29347f1083811f28f3fcba /indra/newview | |
| parent | 6bd628dc57389286090e4b48c919aa314a1ea278 (diff) | |
CID-92
Checker: FORWARD_NULL
Function: LLFloaterPreference::onBtnCancel()
File: /indra/newview/llfloaterpreference.cpp
CID-91
Checker: FORWARD_NULL
Function: LLFloaterPreference::onBtnApply()
File: /indra/newview/llfloaterpreference.cpp
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterpreference.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 03555d4c4e..3c9f7492a2 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -635,7 +635,7 @@ void LLFloaterPreference::onBtnApply( ) if (hasFocus()) { LLUICtrl* cur_focus = dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus()); - if (cur_focus->acceptsTextInput()) + if (cur_focus && cur_focus->acceptsTextInput()) { cur_focus->onCommit(); } @@ -652,7 +652,7 @@ void LLFloaterPreference::onBtnCancel() if (hasFocus()) { LLUICtrl* cur_focus = dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus()); - if (cur_focus->acceptsTextInput()) + if (cur_focus && cur_focus->acceptsTextInput()) { cur_focus->onCommit(); } |