Skip to content

Commit 115d93a

Browse files
committed
don't clean filters if custom communities haven't loaded
1 parent f0ba444 commit 115d93a

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

src/engine/client/serverbrowser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2347,7 +2347,7 @@ void CExcludedCommunityTypeFilterList::Save(IConfigManager *pConfigManager) cons
23472347
void CServerBrowser::CleanFilters()
23482348
{
23492349
// Keep filters if we failed to load any communities
2350-
if(Communities().empty())
2350+
if(Communities().empty() || !m_LoadedCustomCommunities)
23512351
return;
23522352
FavoriteCommunitiesFilter().Clean(Communities());
23532353
CommunitiesFilter().Clean(Communities());

src/engine/client/serverbrowser.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,7 @@ class CServerBrowser : public IServerBrowser
420420
static bool ParseCommunityServers(CCommunity *pCommunity, const json_value &Servers);
421421

422422
// TClient
423+
bool m_LoadedCustomCommunities = false;
423424
std::function<void(std::vector<json_value *> &)> m_CustomCommunitiesFunction = nullptr;
424425
friend class CCustomCommunities;
425426
};

src/game/client/components/tclient/custom_communities.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@ void CCustomCommunities::LoadCustomCommunitiesDDNetInfo()
8181
}
8282
};
8383
pServerBrowser->LoadDDNetServers();
84+
85+
if(!pServerBrowser->m_LoadedCustomCommunities)
86+
pServerBrowser->CleanFilters();
87+
pServerBrowser->m_LoadedCustomCommunities = true;
8488
}
8589

8690
void CCustomCommunities::OnInit()
@@ -90,9 +94,6 @@ void CCustomCommunities::OnInit()
9094

9195
void CCustomCommunities::OnConsoleInit()
9296
{
93-
// Load Custom Communities from the file before the serverbrowser tries to use it
94-
LoadCustomCommunitiesDDNetInfo();
95-
9697
Console()->Chain(
9798
"tc_custom_communities_url", [](IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData) {
9899
pfnCallback(pResult, pCallbackUserData);

0 commit comments

Comments
 (0)