Synchronize changes from 1.6 master branch [ci skip]

github-actions[bot] · github-actions[bot] · commit b081c63745a9 · 2024-12-14T11:39:34.000Z
779183f Fix CClientGUIManager::Exists (#3868)
diff --git a/Client/mods/deathmatch/logic/CClientGUIManager.cpp b/Client/mods/deathmatch/logic/CClientGUIManager.cpp
@@ -43,7 +43,7 @@ void CClientGUIManager::DeleteAll()
 
 bool CClientGUIManager::Exists(CClientGUIElement* pGUIElement)
 {
-    return m_Elements.Contains(pGUIElement);
+    return pGUIElement ? m_Elements.Contains(pGUIElement) : false;
 }
 
 bool CClientGUIManager::Exists(CGUIElement* pCGUIElement)

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ void CClientGUIManager::DeleteAll()`
`43`	`43`
`44`	`44`	`bool CClientGUIManager::Exists(CClientGUIElement* pGUIElement)`
`45`	`45`	`{`
`46`		`- return m_Elements.Contains(pGUIElement);`
	`46`	`+ return pGUIElement ? m_Elements.Contains(pGUIElement) : false;`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`bool CClientGUIManager::Exists(CGUIElement* pCGUIElement)`