Merge pull request #6240 from JosJuice/stream-path-encoding

Don't use wrong encoding for paths when opening streams on Windows

2 files changed, 4 insertions, 2 deletions

diff --git a/Source/Core/Common/ArmCPUDetect.cpp b/Source/Core/Common/ArmCPUDetect.cpp
index 382983db6f..9c85835c07 100644
--- a/Source/Core/Common/ArmCPUDetect.cpp
+++ b/Source/Core/Common/ArmCPUDetect.cpp
@@ -12,6 +12,7 @@
 
 #include "Common/CPUDetect.h"
 #include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
 #include "Common/StringUtil.h"
 
 const char procfile[] = "/proc/cpuinfo";
@@ -22,7 +23,8 @@ static std::string GetCPUString()
   std::string cpu_string = "Unknown";
 
   std::string line;
-  std::ifstream file(procfile);
+  std::ifstream file;
+  File::OpenFStream(file, procfile, std::ios_base::in);
 
   if (!file)
     return cpu_string;
diff --git a/Source/Core/Common/LinearDiskCache.h b/Source/Core/Common/LinearDiskCache.h
index fae1dfc3f5..e97f23a11f 100644
--- a/Source/Core/Common/LinearDiskCache.h
+++ b/Source/Core/Common/LinearDiskCache.h
@@ -124,7 +124,7 @@ public:
     // failed to open file for reading or bad header
     // close and recreate file
     Close();
-    m_file.open(filename, ios_base::out | ios_base::trunc | ios_base::binary);
+    File::OpenFStream(m_file, filename, ios_base::out | ios_base::trunc | ios_base::binary);
     WriteHeader();
     return 0;
   }