From d36afb975ca7017920998998248e2f4f35b0229e Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 15 Sep 2013 08:57:22 +0200 Subject: [PATCH 1/2] - fixed the Linux portion of m_specialpaths.cpp which had a section of GetUserFile duplicated. --- src/m_specialpaths.cpp | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/src/m_specialpaths.cpp b/src/m_specialpaths.cpp index cd116e538a..469a2fa6bc 100644 --- a/src/m_specialpaths.cpp +++ b/src/m_specialpaths.cpp @@ -461,36 +461,7 @@ FString M_GetSavegamesPath() #else // Linux, et al. -FString GetUserFile(const char *file) -{ - FString path; - struct stat info; - path = NicePath("~/" GAME_DIR "/"); - - if (stat(path, &info) == -1) - { - struct stat extrainfo; - - // Sanity check for ~/.config - FString configPath = NicePath("~/.config/"); - if (stat(configPath, &extrainfo) == -1) - { - if (mkdir(configPath, S_IRUSR | S_IWUSR | S_IXUSR) == -1) - { - I_FatalError("Failed to create ~/.config directory:\n%s", strerror(errno)); - } - } - else if (!S_ISDIR(extrainfo.st_mode)) - { - I_FatalError("~/.config must be a directory"); - } - - // This can be removed after a release or two - // Transfer the old zdoom directory to the new location - bool moved = false; - FString oldpath = NicePath("~/.zdoom/"); - if (stat #if defined(__unix__) FString GetUserFile (const char *file) { FString path; From 8847d5649adf011ac5e8cb327e94554f04d2896f Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 15 Sep 2013 23:11:55 +0200 Subject: [PATCH 2/2] - fixed: Bridge needs to call Super::Destroy. --- src/g_shared/a_bridge.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/g_shared/a_bridge.cpp b/src/g_shared/a_bridge.cpp index d669cc3bde..4caa562870 100644 --- a/src/g_shared/a_bridge.cpp +++ b/src/g_shared/a_bridge.cpp @@ -75,6 +75,7 @@ void ACustomBridge::Destroy() thing->Destroy(); } } + Super::Destroy(); } // Action functions for the non-Doom bridge --------------------------------