Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip

2024-06-04 11:04:02 +03:00
parent ba947993c2 080e64faaf
commit 45463dcd75
39 changed files with 296 additions and 141 deletions
--- a/launcher/minecraft/MinecraftInstance.cpp
+++ b/launcher/minecraft/MinecraftInstance.cpp
@@ -1000,7 +1000,7 @@ QString MinecraftInstance::getStatusbarDescription()
    QString description;
    description.append(tr("Minecraft %1").arg(mcVersion));
    if (m_settings->get("ShowGameTime").toBool()) {
-        if (lastTimePlayed() > 0) {
+        if (lastTimePlayed() > 0 && lastLaunch() > 0) {
            QDateTime lastLaunchTime = QDateTime::fromMSecsSinceEpoch(lastLaunch());
            description.append(
                tr(", last played on %1 for %2")