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.

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

Fix system screensaver starting during video playback #3206

Merged

Conversation

nielsvanvelzen
Copy link
Member

@nielsvanvelzen nielsvanvelzen commented Dec 8, 2023

FLAG_KEEP_SCREEN_ON was never set if not using the new in-app screensaver. This caused the system screensaver to start during video playback... whoops.

From my initial testing this does however crash the video player once the (system-)screensaver is closed and the app needs to resume. Will need to do some more testing and potentially fix that (separate PR) see #3207.

Changes

  • Dynammically set FLAG_KEEP_SCREEN_ON based on both the lock count and whether the in-app screensaver is enabled or not

Issues

Fixes #3193

@nielsvanvelzen nielsvanvelzen added the bug Something isn't working label Dec 8, 2023
@nielsvanvelzen nielsvanvelzen added this to the v0.16.1 milestone Dec 8, 2023
@@ -38,17 +47,20 @@
timer?.cancel()

// Hide when interacted with allowed cancelation or when disabled
if (_visible.value && (canCancel || !enabled || activityPaused)) {
if (_visible.value && (canCancel || !inAppEnabled || activityPaused)) {

Check warning

Code scanning / detekt

Complex conditions should be simplified and extracted into well-named methods if necessary. Warning

This condition is too complex (4). Defined complexity threshold for conditions is set to '4'
@nielsvanvelzen nielsvanvelzen merged commit d9eb849 into jellyfin:master Dec 10, 2023
5 checks passed
@nielsvanvelzen nielsvanvelzen deleted the fix-system-screensaver-locks branch December 10, 2023 13:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

System Screensaver Starts During Playback
2 participants