Fix crash when loading a ROM with slot 2 set to load a GBA ROM but no…

… GBA ROM was provided
rafaelvcaetano · Jun 27, 2024 · ceb611e · ceb611e
1 parent 0a3ee93
commit ceb611e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/src/main/cpp/MelonDSAndroidJNI.cpp b/app/src/main/cpp/MelonDSAndroidJNI.cpp
@@ -479,11 +479,11 @@ Java_me_magnum_melonds_MelonEmulator_updateEmulatorConfiguration(JNIEnv* env, jo
 
 MelonDSAndroid::RomGbaSlotConfig* buildGbaSlotConfig(GbaSlotType slotType, const char* romPath, const char* savePath)
 {
-    if (slotType == GbaSlotType::GBA_ROM)
+    if (slotType == GbaSlotType::GBA_ROM && romPath != nullptr)
     {
         MelonDSAndroid::RomGbaSlotConfigGbaRom* gbaSlotConfigGbaRom = new MelonDSAndroid::RomGbaSlotConfigGbaRom {
             .romPath = std::string(romPath),
-            .savePath = std::string(savePath)
+            .savePath = savePath ? std::string(savePath) : "",
         };
         return (MelonDSAndroid::RomGbaSlotConfig*) gbaSlotConfigGbaRom;
     }