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

Add support for MATE Desktop (fixes #12169) #12174

Merged
merged 1 commit into from
Jan 9, 2025

Conversation

spixi
Copy link
Contributor

@spixi spixi commented Jan 8, 2025

Description of Changes

This PR extends the screensaver inhibition function to MATE Desktop, which fixes #12169

Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for submitting a contribution to PCSX2

As this is your first pull request, please be aware of the contributing guidelines.

Additionally, as per recent changes in GitHub Actions, your pull request will need to be approved by a maintainer before GitHub Actions can run against it. You can find more information about this change here.

Please be patient until this happens. In the meantime if you'd like to confirm the builds are passing, you have the option of opening a PR on your own fork, just make sure your fork's master branch is up to date!

.gitignore Outdated
@@ -117,6 +117,8 @@ oprofile_data/

/out/build/x64-Debug (default)
CMakeSettings.json
CMakeCache.txt
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove these changes.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ fixed

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, this is because usually build with mkdir build && cmake -B ./build, but I can cd into ./build first to avoid the CMake cache files in the top-level directory.

@spixi spixi force-pushed the master branch 2 times, most recently from e40dc2f to 12c0399 Compare January 8, 2025 21:27
@F0bes
Copy link
Member

F0bes commented Jan 8, 2025

@TheTechnician27 Would you be able to test this on your MATE VM?

@TheTechnician27
Copy link
Contributor

TheTechnician27 commented Jan 8, 2025

Same test I previously did on the issue report: physically disable kbm and leave the game running. With the 'Inhibit screensaver' option enabled, the screen did not go blank and lock after 6 minutes despite a 3-minute screensaver rule in the DE settings. A control test with the 'Inhibit screensaver' option disabled had the screen go black and lock at the expected time. PR thus appears to work as intended on MATE. 👍

@lightningterror lightningterror merged commit a5e4274 into PCSX2:master Jan 9, 2025
12 checks passed
SternXD pushed a commit to EmulationCollective/XBSX2 that referenced this pull request Jan 10, 2025
This extends the screensaver inhibition function to MATE Desktop,
SternXD pushed a commit to EmulationCollective/XBSX2 that referenced this pull request Jan 13, 2025
This extends the screensaver inhibition function to MATE Desktop,
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG]: Screensaver inhabitation does not disable lock screen
4 participants