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 SDK launcher bug

Browse Source 
Asan: used destroyed temporary to construct '-numreservedcores'.
Changed logic to only pass to engine when input is actually a number and its value is > -1.
This commit is contained in:
Kawe Mazidjatari 2023-01-21 15:34:37 +01:00
parent aed8656d56
commit 3af4ccebc3
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
r5dev/sdklauncher/basepanel.cpp
View File

@ -279,7 +279,7 @@ void CUIBaseSurface::Init()
this->m_ReservedCoresTextBox->SetLocation({ 15, 25 });
this->m_ReservedCoresTextBox->SetTabIndex(0);
this->m_ReservedCoresTextBox->SetReadOnly(false);
this->m_ReservedCoresTextBox->SetText("0");
this->m_ReservedCoresTextBox->SetText("-1");
this->m_ReservedCoresTextBox->SetAnchor(Forms::AnchorStyles::Top | Forms::AnchorStyles::Left);
this->m_EngineBaseGroup->AddControl(this->m_ReservedCoresTextBox);
@ -565,11 +565,13 @@ void CUIBaseSurface::LaunchGame(Forms::Control* pSender)
//-----------------------------------------------------------------------------
void CUIBaseSurface::ParseMaps()
{
fs::directory_iterator fsDir("vpk");
std::regex rgArchiveRegex{ R"([^_]*_(.*)(.bsp.pak000_dir).*)" };
std::smatch smRegexMatches;
for (const fs::directory_entry& dEntry : fs::directory_iterator("vpk"))
for (const fs::directory_entry& dEntry : fsDir)
{
std::string svFileName = dEntry.path().string();
std::string svFileName = dEntry.path().u8string();
std::regex_search(svFileName, smRegexMatches, rgArchiveRegex);
if (!smRegexMatches.empty())
@ -738,17 +740,14 @@ void CUIBaseSurface::ForwardCommandToGame(Forms::Control* pSender)
//-----------------------------------------------------------------------------
void CUIBaseSurface::AppendReservedCoreCount(string& svParameters)
{
const char* pszReservedCores = this->m_ReservedCoresTextBox->Text().ToCString();
if (StringIsDigit(pszReservedCores))
{
int nReservedCores = atoi(pszReservedCores);
if (nReservedCores) // A reserved core count of 0 seems to crash the game on some systems.
int nReservedCores = atoi(this->m_ReservedCoresTextBox->Text().ToCString());
if (nReservedCores > -1) // A reserved core count of 0 seems to crash the game on some systems.
{
svParameters.append("-numreservedcores \"" + this->m_ReservedCoresTextBox->Text() + "\"\n");
}
}
if (StringIsDigit(this->m_WorkerThreadsTextBox->Text().ToCString()))
int nWorkerThreads = atoi(this->m_WorkerThreadsTextBox->Text().ToCString());
if (nWorkerThreads > -1)
svParameters.append("-numworkerthreads \"" + this->m_WorkerThreadsTextBox->Text() + "\"\n");
}