diff options
| author | Petr Mrázek <peterix@users.noreply.github.com> | 2021-05-15 00:35:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-15 00:35:05 +0200 |
| commit | deac64e0a2b740f1f4f462892a17b9a02b109613 (patch) | |
| tree | 87465a368751c04faf9aada615df9fda78302a16 /api | |
| parent | 2f1e8e82a3a2fb16e3970ee6a17f290ef7fe84ab (diff) | |
| parent | de089195cdb79c7f5cf46dd78782d6da5401d8da (diff) | |
| download | PrismLauncher-deac64e0a2b740f1f4f462892a17b9a02b109613.tar.gz PrismLauncher-deac64e0a2b740f1f4f462892a17b9a02b109613.tar.bz2 PrismLauncher-deac64e0a2b740f1f4f462892a17b9a02b109613.zip | |
Merge pull request #3787 from JoelTroch/feature/gh-3450
GH-3450 Add checkboxes to display and record game time
Diffstat (limited to 'api')
| -rw-r--r-- | api/logic/BaseInstance.cpp | 6 | ||||
| -rw-r--r-- | api/logic/minecraft/MinecraftInstance.cpp | 7 |
2 files changed, 12 insertions, 1 deletions
diff --git a/api/logic/BaseInstance.cpp b/api/logic/BaseInstance.cpp index d08ceb2b..cff16631 100644 --- a/api/logic/BaseInstance.cpp +++ b/api/logic/BaseInstance.cpp @@ -134,6 +134,12 @@ void BaseInstance::setRunning(bool running) m_isRunning = running; + if(!m_settings->get("RecordGameTime").toBool()) + { + emit runningStatusChanged(running); + return; + } + if(running) { m_timeStarted = QDateTime::currentDateTime(); diff --git a/api/logic/minecraft/MinecraftInstance.cpp b/api/logic/minecraft/MinecraftInstance.cpp index 37cdece7..2d112757 100644 --- a/api/logic/minecraft/MinecraftInstance.cpp +++ b/api/logic/minecraft/MinecraftInstance.cpp @@ -106,6 +106,11 @@ MinecraftInstance::MinecraftInstance(SettingsObjectPtr globalSettings, SettingsO m_settings->registerOverride(globalSettings->getSetting("UseNativeOpenAL"), nativeLibraryWorkaroundsOverride); m_settings->registerOverride(globalSettings->getSetting("UseNativeGLFW"), nativeLibraryWorkaroundsOverride); + // Game time + auto gameTimeOverride = m_settings->registerSetting("OverrideGameTime", false); + m_settings->registerOverride(globalSettings->getSetting("ShowGameTime"), gameTimeOverride); + m_settings->registerOverride(globalSettings->getSetting("RecordGameTime"), gameTimeOverride); + // DEPRECATED: Read what versions the user configuration thinks should be used m_settings->registerSetting({"IntendedVersion", "MinecraftVersion"}, ""); m_settings->registerSetting("LWJGLVersion", ""); @@ -769,7 +774,7 @@ QString MinecraftInstance::getStatusbarDescription() QString description; description.append(tr("Minecraft %1 (%2)").arg(m_components->getComponentVersion("net.minecraft")).arg(typeName())); - if(totalTimePlayed() > 0) + if(m_settings->get("ShowGameTime").toBool() && totalTimePlayed() > 0) { description.append(tr(", played for %1").arg(prettifyTimeDuration(totalTimePlayed()))); } |