OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-03 01:53:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 934ff507e5 into 9d67bf2662

Browse source
This commit is contained in:
Rodney 2024-06-27 11:04:08 +02:00 committed by GitHub
parent 9d67bf2662 934ff507e5
commit 4044ba819f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
UI/obs-app.cpp
View file

@ -2929,6 +2929,15 @@ static bool vc_runtime_outdated()
return true;
}
void obs_invalid_parameter_handler(const wchar_t *, const wchar_t *,
const wchar_t *, unsigned int, uintptr_t)
{
/* In Release builds the parameters are all NULL, but not having a
* handler would result in the program being terminated.
* By having one that does not abort execution we let the caller handle
* the error codes returned by the function that invoked this. */
}
#endif
int main(int argc, char *argv[])
@ -2957,6 +2966,9 @@ int main(int argc, char *argv[])
#endif
#ifdef _WIN32
#ifndef _DEBUG
_set_invalid_parameter_handler(obs_invalid_parameter_handler);
#endif
// Abort as early as possible if MSVC runtime is outdated
if (vc_runtime_outdated())
return 1;