diff --git a/src/xenia/app/emulator_window.cc b/src/xenia/app/emulator_window.cc index 7dcb51983..ab54e7333 100644 --- a/src/xenia/app/emulator_window.cc +++ b/src/xenia/app/emulator_window.cc @@ -1095,7 +1095,8 @@ void EmulatorWindow::ExportScreenshot(const xe::ui::RawImage& image) { auto t = std::time(nullptr); // The format is: Year-Month-DayTHours-Minutes-Seconds based off ISO 8601 - std::string datetime = fmt::format("{:%Y-%m-%dT%H-%M-%S}", fmt::localtime(t)); + std::string datetime = + fmt::format("{:%Y-%m-%dT%H-%M-%S}", *std::localtime(&t)); // Get the title id of the game because some titles contain characters that // cannot be used as a directory diff --git a/src/xenia/kernel/xam/ui/game_achievements_ui.cc b/src/xenia/kernel/xam/ui/game_achievements_ui.cc index f9a34b8ca..583c8d7c3 100644 --- a/src/xenia/kernel/xam/ui/game_achievements_ui.cc +++ b/src/xenia/kernel/xam/ui/game_achievements_ui.cc @@ -108,7 +108,7 @@ std::string GameAchievementsUI::GetUnlockedTime( achievement_entry.unlock_time.to_time_point())); return fmt::format("Unlocked: Online {:%Y-%m-%d %H:%M}", - fmt::localtime(unlock_time)); + *std::localtime(&unlock_time)); } if (achievement_entry.unlock_time.is_valid()) { @@ -117,7 +117,7 @@ std::string GameAchievementsUI::GetUnlockedTime( achievement_entry.unlock_time.to_time_point())); return fmt::format("Unlocked: Offline ({:%Y-%m-%d %H:%M})", - fmt::localtime(unlock_time)); + *std::localtime(&unlock_time)); } return fmt::format("Unlocked: Offline"); } diff --git a/src/xenia/kernel/xam/ui/title_info_ui.cc b/src/xenia/kernel/xam/ui/title_info_ui.cc index c9d7bff4b..c237758fc 100644 --- a/src/xenia/kernel/xam/ui/title_info_ui.cc +++ b/src/xenia/kernel/xam/ui/title_info_ui.cc @@ -84,12 +84,13 @@ void TitleListUI::DrawTitleEntry(ImGuiIO& io, TitleInfo& entry) { ImGui::GetTextLineHeight()); if (entry.WasTitlePlayed()) { - ImGui::TextUnformatted( - fmt::format("Last played: {:%Y-%m-%d %H:%M}", - fmt::localtime(std::chrono::system_clock::to_time_t( - std::chrono::system_clock::time_point( - entry.last_played.time_since_epoch())))) - .c_str()); + const auto time_date = std::chrono::system_clock::to_time_t( + std::chrono::system_clock::time_point( + entry.last_played.time_since_epoch())); + + ImGui::TextUnformatted(fmt::format("Last played: {:%Y-%m-%d %H:%M}", + *std::localtime(&time_date)) + .c_str()); } else { ImGui::TextUnformatted("Last played: Unknown"); } diff --git a/third_party/fmt b/third_party/fmt index e3ddede6c..407c905e4 160000 --- a/third_party/fmt +++ b/third_party/fmt @@ -1 +1 @@ -Subproject commit e3ddede6c4ee818825c4e5a6dfa1d384860c27d9 +Subproject commit 407c905e45ad75fc29bf0f9bb7c5c2fd3475976f