notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Config files missmatch in Android

Browse source
This commit is contained in:
Pere Pujal i Carabantes 2018-03-09 00:13:26 +01:00
parent f836cc775a
commit e0324d5255
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/tuxpaint.c
View file

@ -22246,9 +22246,9 @@ static void setup_config(char *argv[])
/* Mac OS X: Use a "tuxpaint.cfg" file in the Tux Paint application support folder */ /* Mac OS X: Use a "tuxpaint.cfg" file in the Tux Paint application support folder */
snprintf(str, sizeof(str), "%s/tuxpaint.cfg", macos.preferencesPath()); snprintf(str, sizeof(str), "%s/tuxpaint.cfg", macos.preferencesPath());
#elif defined(__ANDROID__) #elif defined(__ANDROID__)
/* Try to find the first config file: /mnt/sdcard/Android/data/org.tuxpaint/files/tuxpaint.cfg */ /* Try to find the user's config file */
// Donot rely on this file unless you want to override another tuxpaint.cfg in the internal path for debug /* This file is writed by the tuxpaint config activity when the user runs it */
snprintf(str, sizeof(str), "%s/tuxpaint.cfg", savedir); snprintf(str, sizeof(str), "%s/tuxpaint.cfg", SDL_AndroidGetExternalStoragePath());
#else #else
/* Linux and other Unixes: Use 'rc' style (~/.tuxpaintrc) */ /* Linux and other Unixes: Use 'rc' style (~/.tuxpaintrc) */
/* it should it be "~/.tuxpaint/tuxpaintrc" instead, but too late now */ /* it should it be "~/.tuxpaint/tuxpaintrc" instead, but too late now */
@ -22281,9 +22281,9 @@ static void setup_config(char *argv[])
snprintf(str, sizeof(str), "%s/tuxpaint.cfg", macos_globalPreferencesPath()); snprintf(str, sizeof(str), "%s/tuxpaint.cfg", macos_globalPreferencesPath());
parse_file_options(&tmpcfg_sys, str); parse_file_options(&tmpcfg_sys, str);
#elif defined(__ANDROID__) #elif defined(__ANDROID__)
/* Try to find the second config file: /data/data/org.tuxpaint/files/tuxpaint.cfg */ /* Load the config file we provide in assets/etc/tuxpaint.cfg */
/* This file is unzipped from "assets/tuxpaint.zip" and will be modified when users want to set differnt configuraion */ snprintf(str, sizeof(str), "etc/tuxpaint.cfg");
snprintf(str, sizeof(str), "%s/tuxpaint.cfg", SDL_AndroidGetInternalStoragePath());
parse_file_options(&tmpcfg_sys, str); parse_file_options(&tmpcfg_sys, str);
#else #else
/* normally /etc/tuxpaint/tuxpaint.conf */ /* normally /etc/tuxpaint/tuxpaint.conf */