jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Fix configuration path handling for Linux portable builds

Browse Source 
Original code uses simple `ifdef` pattern as well using the preprocessor
definition in a conditional check. With the rework, the definition was
set to an empty string (if the build flag is not enabled), which leads
to it being evaluated as "true" all the time.

This change uses simpler definition check and fences off code relying
on the flag being enabled.
This commit is contained in:
PatTheMav 2022-04-29 20:51:42 +02:00 committed by Ryan Foster
parent 6305b6a973
commit 55b23a26d2
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
UI/obs-app.cpp
View File

@ -2347,13 +2347,10 @@ static void load_debug_privilege(void)
#define CONFIG_PATH BASE_PATH "/config"
#ifndef LINUX_PORTABLE
#define LINUX_PORTABLE 0
#endif
int GetConfigPath(char *path, size_t size, const char *name)
{
if (LINUX_PORTABLE && portable_mode) {
#ifdef LINUX_PORTABLE
if (portable_mode) {
if (name && *name) {
return snprintf(path, size, CONFIG_PATH "/%s", name);
} else {
@ -2362,11 +2359,15 @@ int GetConfigPath(char *path, size_t size, const char *name)
} else {
return os_get_config_path(path, size, name);
}
#else
return os_get_config_path(path, size, name);
#endif
}
char *GetConfigPathPtr(const char *name)
{
if (LINUX_PORTABLE && portable_mode) {
#ifdef LINUX_PORTABLE
if (portable_mode) {
char path[512];
if (snprintf(path, sizeof(path), CONFIG_PATH "/%s", name) > 0) {
@ -2377,6 +2378,9 @@ char *GetConfigPathPtr(const char *name)
} else {
return os_get_config_path_ptr(name);
}
#else
return os_get_config_path_ptr(name);
#endif
}
int GetProgramDataPath(char *path, size_t size, const char *name)