Fix save file path separator

Author: drhelius

src/common.h

@@ -210,6 +210,24 @@ inline char* strncat_fit(char* dest, const char* src, size_t dest_size)
     return strncat(dest, src, dest_size - len - 1);
 }
 
+inline void append_path_component(std::string& path, const char* component)
+{
+    if (path.length() > 0)
+    {
+        char last = path[path.length() - 1];
+        if (last != '/' && last != '\\')
+        {
+#if defined(_WIN32)
+            path += "\\";
+#else
+            path += "/";
+#endif
+        }
+    }
+
+    path += component;
+}
+
 inline bool create_directory_if_not_exists(const char* path)
 {
 #if defined(_WIN32)

src/geargrafx_core.cpp

@@ -263,8 +263,7 @@ void GeargrafxCore::SaveRam(const char* path, bool full_path)
             final_path = path;
             if (!full_path)
             {
-                final_path += "/";
-                final_path += m_media->GetFileName();
+                append_path_component(final_path, m_media->GetFileName());
             }
         }
         else
@@ -303,7 +302,7 @@ void GeargrafxCore::SaveMB128(const char* path, bool full_path)
         {
             final_path = path;
             if (!full_path)
-                final_path += "/mb128.sav";
+                append_path_component(final_path, "mb128.sav");
         }
         else
         {
@@ -332,7 +331,7 @@ void GeargrafxCore::LoadMB128(const char* path, bool full_path)
         {
             final_path = path;
             if (!full_path)
-                final_path += "/mb128.sav";
+                append_path_component(final_path, "mb128.sav");
         }
         else
         {
@@ -371,7 +370,7 @@ void GeargrafxCore::LoadMB128(const char* path, bool full_path)
 
 void GeargrafxCore::LoadRam(const char* path, bool full_path)
 {
-    if (m_media->IsReady())
+    if (m_media->IsReady() && m_memory->IsBackupRamEnabled())
     {
         using namespace std;
         string final_path;
@@ -381,8 +380,7 @@ void GeargrafxCore::LoadRam(const char* path, bool full_path)
             final_path = path;
             if (!full_path)
             {
-                final_path += "/";
-                final_path += m_media->GetFileName();
+                append_path_component(final_path, m_media->GetFileName());
             }
         }
         else
@@ -434,8 +432,7 @@ std::string GeargrafxCore::GetSaveStatePath(const char* path, int index)
     if (IsValidPointer(path))
     {
         full_path = path;
-        full_path += "/";
-        full_path += m_media->GetFileName();
+        append_path_component(full_path, m_media->GetFileName());
     }
     else
         full_path = m_media->GetFilePath();