From b843d82f54494a84eeeb0eaf5c55a07765724279 Mon Sep 17 00:00:00 2001
From: rftr <rftr@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Sat, 6 Aug 2022 17:07:06 +0000
Subject: [PATCH] add nullptr check to features and options screen buttonlists

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9395 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 FeaturesScreen.cpp | 14 ++++++++++++--
 Options Screen.cpp | 16 +++++++++++++---
 2 files changed, 25 insertions(+), 5 deletions(-)

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 );
+			}
+		}
 	}
 }