Merge pull request #590 from linkmauve/rename-dolphin

Common: Change names containing “Dolphin” or “PPSSPP” to something more generic

2 files changed, 8 insertions, 8 deletions

diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp
index 706e7c84..457376bf 100644
--- a/src/common/file_util.cpp
+++ b/src/common/file_util.cpp
@@ -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
 
diff --git a/src/common/mem_arena.cpp b/src/common/mem_arena.cpp
index cc31a88c..76c70701 100644
--- a/src/common/mem_arena.cpp
+++ b/src/common/mem_arena.cpp
@@ -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)
     {