Server Browser updates - history fix & serverlist assert

sabianroberts · jonnyboy0719 · sabianroberts · commit 1dd5f6dbc22b · 2025-12-19T00:08:10.000Z
Remove ServerList assert

Co-Authored-By: Johan Ehrendahl &lt;jonnyboy0719@gmail.com&gt;
diff --git a/cl_dll/gameui/serverbrowser/CBaseTab.cpp b/cl_dll/gameui/serverbrowser/CBaseTab.cpp
@@ -812,6 +812,10 @@ void CBaseTab::UpdateFilterSettings()
 		m_vecServerFilters.AddToTail(MatchMakingKeyValuePair_t("region", szRegCode));
 	}
 
+	// Johan: history should only check for dedicated servers, no p2p.
+	if (m_eMatchMakingType == eHistoryServer)
+		m_vecServerFilters.AddToTail(MatchMakingKeyValuePair_t("dedicated", "1"));
+
 	// copy filter settings into filter file
 	KeyValues* filter = CGameUIViewport::Get()->GetServerBrowser()->GetFilterSaveData(GetName());
 
diff --git a/cl_dll/gameui/serverbrowser/ServerListSorter.cpp b/cl_dll/gameui/serverbrowser/ServerListSorter.cpp
@@ -159,7 +159,7 @@ int __cdecl GameCompare(vgui2::ListPanel* pPanel, const vgui2::ListPanelItem& p1
 		return 0;
 
 	// make sure we haven't added the same server to the list twice
-	Assert(p1.userData != p2.userData);
+	if (p1.userData == p2.userData) return 0;
 
 	return Q_stricmp(s1->m_szGameDescription, s2->m_szGameDescription);
 }

Original file line number	Diff line number	Diff line change
`@@ -812,6 +812,10 @@ void CBaseTab::UpdateFilterSettings()`
`812`	`812`	`m_vecServerFilters.AddToTail(MatchMakingKeyValuePair_t("region", szRegCode));`
`813`	`813`	`}`
`814`	`814`
	`815`	`+ // Johan: history should only check for dedicated servers, no p2p.`
	`816`	`+ if (m_eMatchMakingType == eHistoryServer)`
	`817`	`+ m_vecServerFilters.AddToTail(MatchMakingKeyValuePair_t("dedicated", "1"));`
	`818`	`+`
`815`	`819`	`// copy filter settings into filter file`
`816`	`820`	`KeyValues* filter = CGameUIViewport::Get()->GetServerBrowser()->GetFilterSaveData(GetName());`
`817`	`821`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ int __cdecl GameCompare(vgui2::ListPanel* pPanel, const vgui2::ListPanelItem& p1`
`159`	`159`	`return 0;`
`160`	`160`
`161`	`161`	`// make sure we haven't added the same server to the list twice`
`162`		`- Assert(p1.userData != p2.userData);`
	`162`	`+ if (p1.userData == p2.userData) return 0;`
`163`	`163`
`164`	`164`	`return Q_stricmp(s1->m_szGameDescription, s2->m_szGameDescription);`
`165`	`165`	`}`