piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3967 from JosJuice/remove-boomy

Browse Source 
Remove Boomy
This commit is contained in:
Pierre Bourdon
2016-06-30 12:07:50 +02:00
committed by GitHub
parent 8ff9b299fb 61371f3a4f
commit f8bf839e36
18 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Common/CommonPaths.h
View File

@ -78,6 +78,9 @@
// This one is only used to remove it if it was present
#define SHADERCACHE_LEGACY_DIR "ShaderCache"
// The theme directory used by default
#define DEFAULT_THEME_DIR "Clean"
// Filenames
// Files in the directory returned by GetUserPath(D_CONFIG_IDX)
#define DOLPHIN_CONFIG "Dolphin.ini"

12
Source/Core/Common/FileUtil.cpp
View File

@ -866,12 +866,16 @@ void SetUserPath(unsigned int dir_index, const std::string& path)
std::string GetThemeDir(const std::string& theme_name)
{
std::string dir = File::GetUserPath(D_THEMES_IDX) + theme_name + "/";
if (File::Exists(dir))
return dir;
// If theme does not exist in user's dir load from shared directory
if (!File::Exists(dir))
dir = GetSysDirectory() + THEMES_DIR "/" + theme_name + "/";
// If the theme doesn't exist in the user dir, load from shared directory
dir = GetSysDirectory() + THEMES_DIR "/" + theme_name + "/";
if (File::Exists(dir))
return dir;
return dir;
// If the theme doesn't exist at all, load the default theme
return GetSysDirectory() + THEMES_DIR "/" DEFAULT_THEME_DIR "/";
}
bool WriteStringToFile(const std::string& str, const std::string& filename)