midou/citra-shitamoto-network
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #590 from linkmauve/rename-dolphin

Browse Source 
Common: Change names containing “Dolphin” or “PPSSPP” to something more generic
This commit is contained in:
bunnei 2015-02-20 13:26:15 -05:00
commit 3c5aaafb40
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/file_util.cpp
View File

@ -622,15 +622,15 @@ std::string GetBundleDirectory()
#ifdef _WIN32
std::string& GetExeDirectory()
{
static std::string DolphinPath;
if (DolphinPath.empty())
static std::string exe_path;
if (exe_path.empty())
{
TCHAR Dolphin_exe_Path[2048];
GetModuleFileName(nullptr, Dolphin_exe_Path, 2048);
DolphinPath = Common::TStrToUTF8(Dolphin_exe_Path);
DolphinPath = DolphinPath.substr(0, DolphinPath.find_last_of('\\'));
TCHAR tchar_exe_path[2048];
GetModuleFileName(nullptr, tchar_exe_path, 2048);
exe_path = Common::TStrToUTF8(tchar_exe_path);
exe_path = exe_path.substr(0, exe_path.find_last_of('\\'));
}
return DolphinPath;
return exe_path;
}
#endif

2
src/common/mem_arena.cpp
View File

@ -116,7 +116,7 @@ void MemArena::GrabLowMemSpace(size_t size)
GetSystemInfo(&sysInfo);
#elif defined(ANDROID)
// Use ashmem so we don't have to allocate a file on disk!
fd = ashmem_create_region("PPSSPP_RAM", size);
fd = ashmem_create_region("Citra_RAM", size);
// Note that it appears that ashmem is pinned by default, so no need to pin.
if (fd < 0)
{