Merge pull request #9021 from AdmiralCurtiss/gui-memcard-format-sram

Qt/GCMemcardCreateNewDialog: Use zero values for formatting instead of accessing g_SRAM.
dolphin-emu · Oct 20, 2020 · 299adf5 · 299adf5
2 parents 70ab3bf + 4b91c07
commit 299adf5
Showing 1 changed file with 3 additions and 4 deletions.
diff --git 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;