From 626d2379bc8e8897c81a7d5e51dd309462c2cfd5 Mon Sep 17 00:00:00 2001
From: Arisotura <thetotalworm@gmail.com>
Date: Mon, 17 Jun 2024 14:51:32 +0200
Subject: [PATCH] * fix default for audio volume * add default bools for
 battery settings

---
 src/frontend/qt_sdl/Config.cpp      | 4 +++-
 src/frontend/qt_sdl/EmuInstance.cpp | 2 +-
 src/frontend/qt_sdl/Platform.cpp    | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/frontend/qt_sdl/Config.cpp b/src/frontend/qt_sdl/Config.cpp
index 8cdc75a2..98749175 100644
--- a/src/frontend/qt_sdl/Config.cpp
+++ b/src/frontend/qt_sdl/Config.cpp
@@ -63,7 +63,7 @@ DefaultList<int> DefaultInts =
     {"Instance*.Firmware.BirthdayDay", 1},
     {"MP.AudioMode", 1},
     {"MP.RecvTimeout", 25},
-    {"Audio.Volume", 256},
+    {"Instance*.Audio.Volume", 256},
     {"Mic.InputType", 1},
     {"Mouse.HideSeconds", 5},
     {"Instance*.DSi.Battery.Level", 0xF},
@@ -99,6 +99,8 @@ DefaultList<bool> DefaultBools =
     {"LimitFPS", true},
     {"Window*.ShowOSD", true},
     {"Emu.DirectBoot", true},
+    {"Instance*.DS.Battery.LevelOkay", true},
+    {"Instance*.DSi.Battery.Charging", true},
 #ifdef JIT_ENABLED
     {"JIT.BranchOptimisations", true},
     {"JIT.LiteralOptimisations", true},
diff --git a/src/frontend/qt_sdl/EmuInstance.cpp b/src/frontend/qt_sdl/EmuInstance.cpp
index 5adf671f..73bba4d8 100644
--- a/src/frontend/qt_sdl/EmuInstance.cpp
+++ b/src/frontend/qt_sdl/EmuInstance.cpp
@@ -534,7 +534,7 @@ std::string EmuInstance::getEffectiveFirmwareSavePath()
 // OR the path to the wi-fi settings.
 void EmuInstance::initFirmwareSaveManager() noexcept
 {
-    firmwareSave = std::make_unique<SaveManager>(getEffectiveFirmwareSavePath());
+    firmwareSave = std::make_unique<SaveManager>(getEffectiveFirmwareSavePath() + instanceFileSuffix());
 }
 
 std::string EmuInstance::getSavestateName(int slot)
diff --git a/src/frontend/qt_sdl/Platform.cpp b/src/frontend/qt_sdl/Platform.cpp
index ef8896fb..eea96820 100644
--- a/src/frontend/qt_sdl/Platform.cpp
+++ b/src/frontend/qt_sdl/Platform.cpp
@@ -404,6 +404,7 @@ void WriteGBASave(const u8* savedata, u32 savelen, u32 writeoffset, u32 writelen
 void WriteFirmware(const Firmware& firmware, u32 writeoffset, u32 writelen, void* userdata)
 {
     EmuInstance* inst = (EmuInstance*)userdata;
+    printf("saving firmware for instance %d\n", inst->getInstanceID());
     if (!inst->firmwareSave)
         return;