From 86905e89e9deca17e65185f9dc612df37ee97dc3 Mon Sep 17 00:00:00 2001 From: Nicky Date: Tue, 12 Nov 2013 10:58:30 +0100 Subject: [PATCH] Crash prevention, don't dereference possible 0-pointer. --- indra/llui/llnotifications.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp index 9b528e2401..b469be5883 100755 --- a/indra/llui/llnotifications.cpp +++ b/indra/llui/llnotifications.cpp @@ -192,7 +192,7 @@ LLNotificationForm::LLNotificationForm(const std::string& name, const LLNotifica : mIgnore(IGNORE_NO), mInvertSetting(false) // ignore settings by default mean true=show, false=ignore { - if (p.ignore.isProvided()) + if (p.ignore.isProvided() && LLUI::sSettingGroups["ignores"] && LLUI::sSettingGroups["config"]) { mIgnoreMsg = p.ignore.text; @@ -428,7 +428,7 @@ LLNotificationTemplate::LLNotificationTemplate(const LLNotificationTemplate::Par mShowToast(p.show_toast), mSoundName("") { - if (p.sound.isProvided() + if (p.sound.isProvided() && LLUI::sSettingGroups["config"] && LLUI::sSettingGroups["config"]->controlExists(p.sound)) { mSoundName = p.sound;