R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix SDKLauncher bug

Browse Source 
Fix bug where SDK Launcher would display duplicate map names if server and client VPK's are installed within the same VPK directory.
This commit is contained in:
Kawe Mazidjatari 2022-06-24 17:03:50 +02:00
parent fbcee16f97
commit f0519efbb5
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
r5dev/sdklauncher/basepanel.cpp
View File

@ -563,11 +563,16 @@ void CUIBaseSurface::ParseMaps()
}
else if (strcmp(smRegexMatches[1].str().c_str(), "mp_common") == 0)
{
this->m_MapCombo->Items.Add("mp_lobby");
if (!this->m_MapCombo->Items.Contains("mp_lobby"))
{
this->m_MapCombo->Items.Add("mp_lobby");
}
continue;
}
this->m_MapCombo->Items.Add(smRegexMatches[1].str().c_str());
else if (!this->m_MapCombo->Items.Contains(smRegexMatches[1].str().c_str()))
{
this->m_MapCombo->Items.Add(smRegexMatches[1].str().c_str());
}
}
}
}
@ -591,7 +596,10 @@ void CUIBaseSurface::ParsePlaylists()
const auto& vcPlaylists = vRoot.childs.at("Playlists");
for (auto [id, it] = std::tuple{ 1, vcPlaylists->childs.begin()}; it != vcPlaylists->childs.end(); id++, it++)
{
this->m_PlaylistCombo->Items.Add(it->first.c_str());
if (!this->m_PlaylistCombo->Items.Contains(it->first.c_str()))
{
this->m_PlaylistCombo->Items.Add(it->first.c_str());
}
}
}
}