FIRE-14471 - don't crash when quick prefs edtor tries to update values without having a control selected. Firestorm_4.6.9

Fri, 21 Nov 2014 22:48:14 +0100

author
ziree
date
Fri, 21 Nov 2014 22:48:14 +0100
branch
Firestorm_4.6.9
changeset 43061
4e925b1eb178
parent 43022
6744cf22c5d2
child 43062
cec586b490f6

FIRE-14471 - don't crash when quick prefs edtor tries to update values without having a control selected.

indra/newview/quickprefs.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/quickprefs.cpp	Sun Nov 30 01:50:24 2014 +0100
     1.2 +++ b/indra/newview/quickprefs.cpp	Fri Nov 21 22:48:14 2014 +0100
     1.3 @@ -1402,6 +1402,12 @@
     1.4  		return;
     1.5  	}
     1.6  
     1.7 +	// don't crash when we try to update values without having a control selected
     1.8 +	if(mSelectedControl=="")
     1.9 +	{
    1.10 +		return;
    1.11 +	}
    1.12 +
    1.13  	// remember the current and possibly new control names
    1.14  	std::string old_control_name=mSelectedControl;
    1.15  	std::string new_control_name=mControlNameCombo->getValue();

mercurial