diff options
| author | Léo Lam <leo@leolam.fr> | 2020-10-20 14:55:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-20 14:55:23 +0200 |
| commit | 299adf537d42f0cc0a032cd817ba364d44048545 (patch) | |
| tree | 83585ebef62c2d5529831365ebd8aae695103d0b /Source/Core | |
| parent | 70ab3bf7b3730278b84508877f91c4e453d6ae4d (diff) | |
| parent | 4b91c071c167abdf5768da33f949a4b74fe43986 (diff) | |
Merge pull request #9021 from AdmiralCurtiss/gui-memcard-format-sram
Qt/GCMemcardCreateNewDialog: Use zero values for formatting instead of accessing g_SRAM.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinQt/GCMemcardCreateNewDialog.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/Core/DolphinQt/GCMemcardCreateNewDialog.cpp b/Source/Core/DolphinQt/GCMemcardCreateNewDialog.cpp index b54766d157..07f8ba454c 100644 --- a/Source/Core/DolphinQt/GCMemcardCreateNewDialog.cpp +++ b/Source/Core/DolphinQt/GCMemcardCreateNewDialog.cpp @@ -77,10 +77,9 @@ bool GCMemcardCreateNewDialog::CreateCard() if (path.isEmpty()) return false; - // TODO: The dependency on g_SRAM here is sketchy. We should instead use sensible default values. - const CardFlashId& flash_id = g_SRAM.settings_ex.flash_id[Memcard::SLOT_A]; - const u32 rtc_bias = g_SRAM.settings.rtc_bias; - const u32 sram_language = static_cast<u32>(g_SRAM.settings.language); + const CardFlashId flash_id{}; + const u32 rtc_bias = 0; + const u32 sram_language = 0; const u64 format_time = Common::Timer::GetLocalTimeSinceJan1970() - ExpansionInterface::CEXIIPL::GC_EPOCH; |