liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mac: use fewer variables

Browse Source
This commit is contained in:
Richard Barber
2020-02-17 11:31:39 -08:00
parent 38037aee8c
commit e4f16c2005
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtgui/options.cc
View File

@@ -2273,12 +2273,10 @@ void Options::load(bool lightweight)
#ifdef __APPLE__ #ifdef __APPLE__
// Build Application Support directory path for macOS. // Build Application Support directory path for macOS.
const char* homedir = g_getenv("HOME"); // This returns the current container data dir in ~/Library const char* homedir = g_getenv("HOME"); // This returns the current container data dir in ~/Library
std::string configdir = "/Application Support/RawTherapee/config";
std::string homebuf{homedir}; std::string homebuf{homedir};
int homelength = strlen(homebuf.c_str()); int homelength = strlen(homebuf.c_str());
homebuf[homelength-45] = '\0'; homebuf[homelength-44] = '\0';
configdir = "/Application Support/RawTherapee/config"; std::string configpath = homebuf + "/Application Support/RawTherapee/config";
std::string configpath = homebuf + configdir;
path = configpath.c_str(); path = configpath.c_str();
std::cout<<path<<std::endl; std::cout<<path<<std::endl;
#else #else
@@ -2328,9 +2326,7 @@ void Options::load(bool lightweight)
// Modify the path of the cache folder to the one provided in RT_CACHE environment variable. Build the cache folder name in macOS. // Modify the path of the cache folder to the one provided in RT_CACHE environment variable. Build the cache folder name in macOS.
#ifdef __APPLE__ #ifdef __APPLE__
const char* cachedir; std::string cachepath = homebuf + "/Application Support/RawTherapee/cache";
cachedir = "/Application Support/RawTherapee/cache"; // Back out of containers and into App. Support
std::string cachepath = homebuf + cachedir;
path = cachepath.c_str(); path = cachepath.c_str();
std::cout<<path<<std::endl; std::cout<<path<<std::endl;
#else #else