summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/common/file_util.cpp14
-rw-r--r--src/common/mem_arena.cpp2
2 files changed, 8 insertions, 8 deletions
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp
index 706e7c842..457376bf4 100644
--- a/src/common/file_util.cpp
+++ b/src/common/file_util.cpp
@@ -622,15 +622,15 @@ std::string GetBundleDirectory()
622#ifdef _WIN32 622#ifdef _WIN32
623std::string& GetExeDirectory() 623std::string& GetExeDirectory()
624{ 624{
625 static std::string DolphinPath; 625 static std::string exe_path;
626 if (DolphinPath.empty()) 626 if (exe_path.empty())
627 { 627 {
628 TCHAR Dolphin_exe_Path[2048]; 628 TCHAR tchar_exe_path[2048];
629 GetModuleFileName(nullptr, Dolphin_exe_Path, 2048); 629 GetModuleFileName(nullptr, tchar_exe_path, 2048);
630 DolphinPath = Common::TStrToUTF8(Dolphin_exe_Path); 630 exe_path = Common::TStrToUTF8(tchar_exe_path);
631 DolphinPath = DolphinPath.substr(0, DolphinPath.find_last_of('\\')); 631 exe_path = exe_path.substr(0, exe_path.find_last_of('\\'));
632 } 632 }
633 return DolphinPath; 633 return exe_path;
634} 634}
635#endif 635#endif
636 636
diff --git a/src/common/mem_arena.cpp b/src/common/mem_arena.cpp
index cc31a88cc..76c70701d 100644
--- a/src/common/mem_arena.cpp
+++ b/src/common/mem_arena.cpp
@@ -116,7 +116,7 @@ void MemArena::GrabLowMemSpace(size_t size)
116 GetSystemInfo(&sysInfo); 116 GetSystemInfo(&sysInfo);
117#elif defined(ANDROID) 117#elif defined(ANDROID)
118 // Use ashmem so we don't have to allocate a file on disk! 118 // Use ashmem so we don't have to allocate a file on disk!
119 fd = ashmem_create_region("PPSSPP_RAM", size); 119 fd = ashmem_create_region("Citra_RAM", size);
120 // Note that it appears that ashmem is pinned by default, so no need to pin. 120 // Note that it appears that ashmem is pinned by default, so no need to pin.
121 if (fd < 0) 121 if (fd < 0)
122 { 122 {