diff --git a/FeaturesScreen.cpp b/FeaturesScreen.cpp index 71ce8d46..fca10e4d 100644 --- a/FeaturesScreen.cpp +++ b/FeaturesScreen.cpp @@ -1397,9 +1397,19 @@ void SetToggleBoxes() }//there are no options to set for this toggle_box if (gGameSettings.fFeatures[toggle_box_array[counter]]) - ButtonList[guiFeaturesToggles[counter]]->uiFlags |= BUTTON_CLICKED_ON; + { + if (ButtonList[guiFeaturesToggles[counter]]) + { + ButtonList[guiFeaturesToggles[counter]]->uiFlags |= BUTTON_CLICKED_ON; + } + } else - ButtonList[guiFeaturesToggles[counter]]->uiFlags &= (~BUTTON_CLICKED_ON); + { + if (ButtonList[guiFeaturesToggles[counter]]) + { + ButtonList[guiFeaturesToggles[counter]]->uiFlags &= (~BUTTON_CLICKED_ON); + } + } } } diff --git a/Options Screen.cpp b/Options Screen.cpp index bb163447..59096269 100644 --- a/Options Screen.cpp +++ b/Options Screen.cpp @@ -1664,10 +1664,20 @@ void SetOptionsScreenToggleBoxes() if ( toggle_box_content_rules[ toggle_box_array[ counter ] ] == 2) { continue; }//there are no options to set for this toggle_box - if( gGameSettings.fOptions[ toggle_box_array[ counter ] ] ) - ButtonList[ guiOptionsToggles[ counter ] ]->uiFlags |= BUTTON_CLICKED_ON; + if (gGameSettings.fOptions[toggle_box_array[counter]]) + { + if (ButtonList[guiOptionsToggles[counter]]) + { + ButtonList[ guiOptionsToggles[ counter ] ]->uiFlags |= BUTTON_CLICKED_ON; + } + } else - ButtonList[ guiOptionsToggles[ counter ] ]->uiFlags &= (~BUTTON_CLICKED_ON ); + { + if (ButtonList[guiOptionsToggles[counter]]) + { + ButtonList[ guiOptionsToggles[ counter ] ]->uiFlags &= (~BUTTON_CLICKED_ON ); + } + } } }