1 files changed, 11 insertions, 29 deletions
diff --git a/src/shared/gameinfo.cpp b/src/shared/gameinfo.cpp
index 21e9a586..5439efff 100644
--- a/src/shared/gameinfo.cpp
+++ b/src/shared/gameinfo.cpp
@@ -57,7 +57,7 @@ void GameInfo::identifyMyGamesDirectory(const std::wstring &file)
 {
   // this function attempts 3 (three!) ways to determine the correct "My Games" folder.
   wchar_t myDocuments[MAX_PATH];
-  memset(myDocuments, '\0', MAX_PATH);
+  memset(myDocuments, '\0', MAX_PATH * sizeof(wchar_t));
 
   m_MyGamesDirectory.clear();
 
@@ -137,71 +137,53 @@ std::wstring GameInfo::getGameDirectory() const
 
 std::wstring GameInfo::getModsDir() const
 {
-  std::wostringstream temp;
-  temp << m_OrganizerDataDirectory << L"\\mods";
-  return temp.str();
+  return m_OrganizerDirectory + L"\\mods";
 }
 
 std::wstring GameInfo::getProfilesDir() const
 {
-  std::wostringstream temp;
-  temp << m_OrganizerDataDirectory << L"\\profiles";
-  return temp.str();
+  return m_OrganizerDirectory + L"\\profiles";
 }
 
 std::wstring GameInfo::getIniFilename() const
 {
-  std::wostringstream temp;
-  temp << m_OrganizerDataDirectory << L"\\ModOrganizer.ini";
-  return temp.str();
+  return m_OrganizerDirectory + L"\\ModOrganizer.ini";
 }
 
 
 std::wstring GameInfo::getDownloadDir() const
 {
-  std::wostringstream temp;
-  temp << m_OrganizerDataDirectory << L"\\downloads";
-  return temp.str();
+  return m_OrganizerDirectory + L"\\downloads";
 }
 
 
 std::wstring GameInfo::getCacheDir() const
 {
-  std::wostringstream temp;
-  temp << m_OrganizerDataDirectory << L"\\webcache";
-  return temp.str();
+  return m_OrganizerDirectory + L"\\webcache";
 }
 
 
 std::wstring GameInfo::getOverwriteDir() const
 {
-  std::wostringstream temp;
-  temp << m_OrganizerDataDirectory << "\\overwrite";
-  return temp.str();
+  return m_OrganizerDirectory + L"\\overwrite";
 }
 
 
 std::wstring GameInfo::getLogDir() const
 {
-  std::wostringstream temp;
-  temp << m_OrganizerDataDirectory << "\\logs";
-  return temp.str();
+  return m_OrganizerDirectory + L"\\logs";
 }
 
 
 std::wstring GameInfo::getLootDir() const
 {
-  std::wostringstream temp;
-  temp << m_OrganizerDirectory << "\\loot";
-  return temp.str();
+  return m_OrganizerDirectory + L"\\loot";
 }
 
 
 std::wstring GameInfo::getTutorialDir() const
 {
-  std::wostringstream temp;
-  temp << m_OrganizerDirectory << "\\tutorials";
-  return temp.str();
+  return m_OrganizerDirectory + L"\\tutorials";
 }
 
 
@@ -219,7 +201,7 @@ std::vector<std::wstring> GameInfo::getSteamVariants() const
 std::wstring GameInfo::getLocalAppFolder() const
 {
   wchar_t localAppFolder[MAX_PATH];
-  memset(localAppFolder, '\0', MAX_PATH);
+  memset(localAppFolder, '\0', MAX_PATH * sizeof(wchar_t));
 
   if (::SHGetFolderPathW(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, localAppFolder) == S_OK) {
     return localAppFolder;