From e1821d00235d33b2fe384fffa7e34b00b7af3ec9 Mon Sep 17 00:00:00 2001 From: Jesse Talavera Date: Fri, 15 Dec 2023 08:56:10 -0500 Subject: Simplify the SRAM's representation in `NDSCartArgs` (#1914) * Simplify the SRAM's representation in `NDSCartArgs` - I overthought this one. - I could've just checked `args && args->SRAM`, but then some other poor bastard might make this mistake. - Don't mix `pair`, `optional`, and `unique_ptr` all at once, kids. * Fix a `nullptr` read --- src/frontend/qt_sdl/ROMManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/frontend/qt_sdl') diff --git a/src/frontend/qt_sdl/ROMManager.cpp b/src/frontend/qt_sdl/ROMManager.cpp index b065ad1..a20af20 100644 --- a/src/frontend/qt_sdl/ROMManager.cpp +++ b/src/frontend/qt_sdl/ROMManager.cpp @@ -1316,8 +1316,8 @@ bool LoadROM(EmuThread* emuthread, QStringList filepath, bool reset) // the ROM is homebrew or not. // So this is the card we *would* load if the ROM were homebrew. .SDCard = GetDLDISDCardArgs(), - - .SRAM = std::make_pair(std::move(savedata), savelen), + .SRAM = std::move(savedata), + .SRAMLength = savelen, }; auto cart = NDSCart::ParseROM(std::move(filedata), filelen, std::move(cartargs)); -- cgit v1.2.3