Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ensure total play time is not negative #1712

Merged
merged 6 commits into from Dec 11, 2023
Merged

Ensure total play time is not negative #1712

merged 6 commits into from Dec 11, 2023

Conversation

Trial97
Copy link
Member

@Trial97 Trial97 commented Oct 15, 2023 •
edited

blocked by #1857(because it fixes the reset setting stuff)
fixes #1471

@Trial97
ensured totalTimePlayed is allways greater than 0
b075711 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
@Trial97 Trial97 added bug Something isn't working simple change changelog:fixed A PR that appears under "Fixed" in the changelog labels Oct 15, 2023
@TheKodeToad
Copy link
Member

Maybe reset the setting on start like #1325?

@Trial97
Copy link
Member Author

Trial97 commented Oct 15, 2023

good idea let me implement that

@Trial97
reset the setting if is under 0
52c94eb 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
@Trial97 Trial97 added this to the 8.1 milestone Oct 21, 2023
@Trial97
reseted the setting
4e3132e 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
@Trial97 Trial97 added the blocked Blocked until another PR is merged label Nov 17, 2023
@Scrumplex Scrumplex added the backport release-8.x Backport PR automatically label Dec 11, 2023
@Trial97 Trial97 removed the blocked Blocked until another PR is merged label Dec 11, 2023
@timoreo22 timoreo22 merged commit 4612607 into PrismLauncher:develop Dec 11, 2023
32 checks passed
@github-actions GitHub Actions
Copy link
Contributor

Backport failed because this pull request contains merge commits. You can either backport this pull request manually, or configure the action to skip merge commits.

Scrumplex pushed a commit that referenced this pull request Dec 11, 2023
@timoreo22 @Scrumplex
Merge pull request #1712 from Trial97/current_time
743d487
@Scrumplex Scrumplex added manual backport PRs that have been backported manually and removed backport release-8.x Backport PR automatically labels Dec 11, 2023
LunaisLazier pushed a commit to LunaisLazier/ShatteredPrism that referenced this pull request Feb 9, 2024
@timoreo22 @LunaisLazier
Merge pull request PrismLauncher#1712 from Trial97/current_time
edc5f04
@Scrumplex Scrumplex changed the title ensure totalTimePlayed is always greater than 0 Ensure total play time is not negative Mar 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Scrumplex Scrumplex Scrumplex approved these changes

@timoreo22 timoreo22 timoreo22 approved these changes

Assignees
No one assigned
Labels
bug Something isn't working changelog:fixed A PR that appears under "Fixed" in the changelog manual backport PRs that have been backported manually simple change
Projects
None yet
Milestone
8.1
Development

Successfully merging this pull request may close these issues.

Total playtime displayed as 0s
4 participants
@Trial97 @TheKodeToad @Scrumplex @timoreo22