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 dedicated server crash for Linux (Lutris and Wine)

Browse Source 
The issue was caused by checking if a file with '//*/' in its path exist on the disk. This causes crashes on Lutris and Wine.
This commit is contained in:
Amos 2022-01-27 03:55:47 +01:00
parent edac787bf7
commit 3eec52e79b
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
r5dev/launcher/IApplication.cpp
View File

@ -1,3 +1,9 @@
//=============================================================================//
//
// Purpose: IApplication methods
//
//=============================================================================//
#include "core/stdafx.h"
#include "tier0/cvar.h"
#include "launcher/IApplication.h"
@ -56,6 +62,8 @@ bool HIApplication_Create(void* a1)
{
g_vsvAllConVars.push_back(map.first.c_str());
}
g_bAppSystemInit = true;
return IAppSystem_Create(a1);
}

2
r5dev/launcher/IApplication.h
View File

@ -35,6 +35,8 @@ bool HIApplication_Create(void* a1);
void IApplication_Attach();
void IApplication_Detach();
inline bool g_bAppSystemInit = false;
///////////////////////////////////////////////////////////////////////////////
class HApplication : public IDetour
{

6
r5dev/vpc/basefilesystem.cpp
View File

@ -2,7 +2,9 @@
#include "core/logdef.h"
#include "tier0/cvar.h"
#include "vpc/basefilesystem.h"
#ifndef DEDICATED
#include "gameui/IConsole.h"
#endif // !DEDICATED
//---------------------------------------------------------------------------------
// Purpose: prints the output of the filesystem based on the warning level
@ -64,7 +66,7 @@ FileHandle_t HCBaseFileSystem_ReadFromVPK(void* pVpk, std::int64_t* pResults, ch
// TODO: obtain 'mod' SearchPath's instead.
svFilePath.insert(0, "platform\\");
if (FileExists(svFilePath.c_str()) || FileExists(pszFilePath))
if (FileExists(svFilePath.c_str()) /*|| FileExists(pszFilePath)*/)
{
*pResults = -1;
return (void*)pResults;
@ -88,7 +90,7 @@ bool HCBaseFileSystem_ReadFromCache(void* pFileSystem, char* pszFilePath, void*
// TODO: obtain 'mod' SearchPath's instead.
svFilePath.insert(0, "platform\\");
if (FileExists(svFilePath.c_str()) || FileExists(pszFilePath))
if (FileExists(svFilePath.c_str()) /*|| FileExists(pszFilePath)*/)
{
return false;
}