From 15548758ac825e61648fd6adc2fba96256875fac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?eray=20or=C3=A7unus?= <erayorcunus@gmail.com>
Date: Fri, 3 Jul 2020 16:51:33 +0300
Subject: Bettah car enter canceling, fix CFO crash, ped objs. renaming

---
 src/extras/frontendoption.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/extras/frontendoption.cpp')

diff --git a/src/extras/frontendoption.cpp b/src/extras/frontendoption.cpp
index bfeca848..51814f35 100644
--- a/src/extras/frontendoption.cpp
+++ b/src/extras/frontendoption.cpp
@@ -43,10 +43,13 @@ GetNumberOfMenuOptions(int screen)
 	return Rows;
 }
 
-// Used before reloading in InitialiseChangedLanguageSettings and debugmenu
+// Used before populating options, but effective in InitialiseChangedLanguageSettings and debugmenu
 void
 RemoveCustomFrontendOptions()
 {
+	if (numCustomFrontendOptions == 0)
+		return;
+
 	for (int i = 0; i < MENUPAGES; i++) {
 		for (int j = 0; j < NUM_MENUROWS; j++) {
 			if (aScreens[i].m_aEntries[j].m_Action == MENUACTION_TRIGGERFUNC) {
-- 
cgit v1.2.3