From 22cba3641a7700339e59ec198ed5d40d21d4173f Mon Sep 17 00:00:00 2001 From: Garux Date: Wed, 7 Feb 2018 22:43:13 +0300 Subject: [PATCH] import https://gitlab.com/xonotic/netradiant/commit/c359b728f63d9fe2adc84f88ec36639e61a4a05a Try ~/.{prefix} on Apple OS X if /Library/Application Support/{prefix+1} fails. --- radiant/mainframe.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp index d2fd6bc4..01ea5aa1 100644 --- a/radiant/mainframe.cpp +++ b/radiant/mainframe.cpp @@ -202,6 +202,8 @@ void HomePaths_Realise(){ g_qeglobals.m_userEnginePath = path.c_str(); break; } + path.clear(); + path << DirectoryCleaned( g_get_home_dir() ) << prefix << "/"; #endif #if defined( WIN32 ) @@ -3635,10 +3637,10 @@ void MainFrame_Construct(){ const char* ENGINEPATH_ATTRIBUTE = #if defined( WIN32 ) "enginepath_win32" -#elif defined( __linux__ ) || defined ( __FreeBSD__ ) - "enginepath_linux" #elif defined( __APPLE__ ) "enginepath_macos" +#elif defined( __linux__ ) || defined ( __FreeBSD__ ) + "enginepath_linux" #else #error "unknown platform" #endif