mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-05-18 21:38:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

frontend: Remove move_to_xdg (again)

Browse Source 
To support upgrades from older versions move_to_xdg was reintroduced for
FreeBSD.  This has now been available since release 31.0, so users have
likely upgraded across this version and it is no longer needed.

This reverts commit 39b91d8875.
This commit is contained in:
Ed Maste
2025-03-13 16:39:38 -04:00
committed by Ryan Foster
parent 750c016161
commit d820beb2a7
1 changed files with 0 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
frontend/obs-main.cpp
View File

@@ -304,35 +304,6 @@ static uint64_t convert_log_name(bool has_prefix, const char *name)
return std::stoull(timestring.str());
}
/* If upgrading from an older (non-XDG) build of OBS, move config files to XDG directory. */
/* TODO: Remove after version 32.0. */
#if defined(__FreeBSD__)
static void move_to_xdg(void)
{
char old_path[512];
char new_path[512];
char *home = getenv("HOME");
if (!home)
return;
if (snprintf(old_path, sizeof(old_path), "%s/.obs-studio", home) <= 0)
return;
/* make base xdg path if it doesn't already exist */
if (GetAppConfigPath(new_path, sizeof(new_path), "") <= 0)
return;
if (os_mkdirs(new_path) == MKDIR_ERROR)
return;
if (GetAppConfigPath(new_path, sizeof(new_path), "obs-studio") <= 0)
return;
if (os_file_exists(old_path) && !os_file_exists(new_path)) {
rename(old_path, new_path);
}
}
#endif
static void delete_oldest_file(bool has_prefix, const char *location)
{
BPtr<char> logDir(GetAppConfigPathPtr(location));
@@ -920,10 +891,6 @@ int main(int argc, char *argv[])
base_get_log_handler(&def_log_handler, nullptr);
#if defined(__FreeBSD__)
move_to_xdg();
#endif
obs_set_cmdline_args(argc, argv);
for (int i = 1; i < argc; i++) {