Merge branch 'main' into splash

nicolasnoble · web-flow · commit 33adecd600b2 · 2025-11-14T20:23:34.000-08:00
diff --git a/src/gui/gui.cc b/src/gui/gui.cc
@@ -2420,11 +2420,11 @@ bool PCSX::GUI::about() {
                             clip::set_text(
                                 fmt::format("Version: {}\nBuild: {}\nChangeset: {}\nDate & time: {:%Y-%m-%d %H:%M:%S}",
                                             version.version, version.buildId.value(), version.changeset,
-                                            fmt::localtime(version.timestamp)));
+                                            *std::localtime(&version.timestamp)));
                         } else {
                             clip::set_text(fmt::format("Version: {}\nChangeset: {}\nDate & time: {:%Y-%m-%d %H:%M:%S}",
                                                        version.version, version.changeset,
-                                                       fmt::localtime(version.timestamp)));
+                                                       *std::localtime(&version.timestamp)));
                         }
                     }
                     ImGui::Text(_("Version: %s"), version.version.c_str());
@@ -2436,7 +2436,7 @@ bool PCSX::GUI::about() {
                     if (ImGui::SmallButton(version.changeset.c_str())) {
                         openUrl(fmt::format("https://github.com/grumpycoders/pcsx-redux/commit/{}", version.changeset));
                     }
-                    std::tm tm = fmt::localtime(version.timestamp);
+                    std::tm tm = *std::localtime(&version.timestamp);
                     std::string timestamp = fmt::format("{:%Y-%m-%d %H:%M:%S}", tm);
                     ImGui::Text(_("Date & time: %s"), timestamp.c_str());
                 }
diff --git a/src/main/main.cc b/src/main/main.cc
@@ -218,7 +218,7 @@ int pcsxMain(int argc, char **argv) {
         fmt::print(
             "{{\n  \"version\": \"{}\",\n  \"changeset\": \"{}\",\n  \"timestamp\": \"{}\",\n  \"timestampDecoded\": "
             "\"{:%Y-%m-%d %H:%M:%S}\"\n}}\n",
-            version.version, version.changeset, version.timestamp, fmt::localtime(version.timestamp));
+            version.version, version.changeset, version.timestamp, *std::localtime(&version.timestamp));
         return 0;
     }
 
diff --git a/third_party/fmt b/third_party/fmt
@@ -1 +1 @@
-Subproject commit e69e5f977d458f2650bb346dadf2ad30c5320281
+Subproject commit 407c905e45ad75fc29bf0f9bb7c5c2fd3475976f

Original file line number	Diff line number	Diff line change
`@@ -2420,11 +2420,11 @@ bool PCSX::GUI::about() {`
`2420`	`2420`	`clip::set_text(`
`2421`	`2421`	`fmt::format("Version: {}\nBuild: {}\nChangeset: {}\nDate & time: {:%Y-%m-%d %H:%M:%S}",`
`2422`	`2422`	`version.version, version.buildId.value(), version.changeset,`
`2423`		`- fmt::localtime(version.timestamp)));`
	`2423`	`+ *std::localtime(&version.timestamp)));`
`2424`	`2424`	`} else {`
`2425`	`2425`	`clip::set_text(fmt::format("Version: {}\nChangeset: {}\nDate & time: {:%Y-%m-%d %H:%M:%S}",`
`2426`	`2426`	`version.version, version.changeset,`
`2427`		`- fmt::localtime(version.timestamp)));`
	`2427`	`+ *std::localtime(&version.timestamp)));`
`2428`	`2428`	`}`
`2429`	`2429`	`}`
`2430`	`2430`	`ImGui::Text(_("Version: %s"), version.version.c_str());`
`@@ -2436,7 +2436,7 @@ bool PCSX::GUI::about() {`
`2436`	`2436`	`if (ImGui::SmallButton(version.changeset.c_str())) {`
`2437`	`2437`	`openUrl(fmt::format("https://github.com/grumpycoders/pcsx-redux/commit/{}", version.changeset));`
`2438`	`2438`	`}`
`2439`		`- std::tm tm = fmt::localtime(version.timestamp);`
	`2439`	`+ std::tm tm = *std::localtime(&version.timestamp);`
`2440`	`2440`	`std::string timestamp = fmt::format("{:%Y-%m-%d %H:%M:%S}", tm);`
`2441`	`2441`	`ImGui::Text(_("Date & time: %s"), timestamp.c_str());`
`2442`	`2442`	`}`
Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ int pcsxMain(int argc, char **argv) {`
`218`	`218`	`fmt::print(`
`219`	`219`	`"{{\n \"version\": \"{}\",\n \"changeset\": \"{}\",\n \"timestamp\": \"{}\",\n \"timestampDecoded\": "`
`220`	`220`	`"\"{:%Y-%m-%d %H:%M:%S}\"\n}}\n",`
`221`		`- version.version, version.changeset, version.timestamp, fmt::localtime(version.timestamp));`
	`221`	`+ version.version, version.changeset, version.timestamp, *std::localtime(&version.timestamp));`
`222`	`222`	`return 0;`
`223`	`223`	`}`
`224`	`224`