Skip to content

Fix showCursor not updating controls state when cursor already visible (#1034) #4448

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

Merged
merged 4 commits into from
Sep 23, 2025
Merged

Fix showCursor not updating controls state when cursor already visible (#1034) #4448

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da8b7bc
Improve cursor visibility handling in CResource::ShowCursor function
MohabCodeX Sep 10, 2025
9fe81ef
Refactor
MohabCodeX Sep 13, 2025
a51b588
Merge branch 'master' into fix/showcursor-controls-state
MohabCodeX Sep 13, 2025
9861652
Merge branch 'master' into fix/showcursor-controls-state
MohabCodeX Sep 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Client/mods/deathmatch/logic/CResource.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,11 +410,11 @@ void CResource::ShowCursor(bool bShow, bool bToggleControls)

// Update our showing cursor state
m_bShowingCursor = bShow;

// Show cursor if more than 0 resources wanting the cursor on
g_pCore->ForceCursorVisible(m_iShowingCursor > 0, bToggleControls);
g_pClientGame->SetCursorEventsEnabled(m_iShowingCursor > 0);
}

// Always update cursor and controls state regardless of cursor visibility change
g_pCore->ForceCursorVisible(m_iShowingCursor > 0, bToggleControls);
g_pClientGame->SetCursorEventsEnabled(m_iShowingCursor > 0);
}

SString CResource::GetResourceDirectoryPath(eAccessType accessType, const SString& strMetaPath)
Expand Down