Skip to content

Rm switchon desk - #8454

Merged
nbolton merged 1 commit into
masterfrom
rmSwitchonDesk
Apr 22, 2025
Merged

Rm switchon desk#8454
nbolton merged 1 commit into
masterfrom
rmSwitchonDesk

Conversation

@sithlord48

@sithlord48 sithlord48 commented Apr 6, 2025 •
edited
Loading

Copy link
Copy Markdown
Member

requires: #8519
fixes #8458

A Start to removing the switch on desk option.

Done:

  • Remove from settings
  • Remove from Args
  • Remove from MSWindowsScreen
  • Remove from MSWindowsWatchdog

@github-actions

This comment was marked as outdated.

Sign in to view
@sithlord48
sithlord48 force-pushed the rmSwitchonDesk branch 2 times, most recently from 85ad884 to 9f6a08e Compare April 6, 2025 15:15
@nbolton

nbolton commented Apr 7, 2025

Copy link
Copy Markdown
Member

Ah, nice, didn't see this until after I raised the issue:

@nbolton

nbolton commented Apr 7, 2025

Copy link
Copy Markdown
Member

There is also some code in the watchdog to remove on or near this line:

deskflow/src/lib/platform/MSWindowsWatchdog.cpp

Line 156 in fbc9168

if (elevatedToken || m_session.isProcessInSession("logonui.exe", nullptr)) {

I think m_session.isProcessInSession("logonui.exe", nullptr) can go, and one of the lines below:
if (!m_session.isProcessInSession("winlogon.exe", &process)) {

There's probably lots of other code in the Daemon/watchdog we can remove too, but it may take some time to discover.

@sithlord48

sithlord48 commented Apr 7, 2025

Copy link
Copy Markdown
Member Author

Feel free to take this over @nbolton

@sithlord48
sithlord48 force-pushed the rmSwitchonDesk branch 5 times, most recently from c3cecf8 to 7059d29 Compare April 19, 2025 12:32
@sithlord48
sithlord48 marked this pull request as ready for review April 19, 2025 12:32
@sithlord48
sithlord48 requested a review from nbolton April 19, 2025 12:33
@sithlord48 sithlord48 added the 🪟 windows This issue affects Windows label Apr 20, 2025
@nbolton

nbolton commented Apr 21, 2025 •
edited
Loading

Copy link
Copy Markdown
Member

Thinking on this, I'll do some testing and probably land as is, then we can remove the rest of the dead code later in another PR.

nbolton
nbolton approved these changes Apr 21, 2025
View reviewed changes

@nbolton nbolton left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

A bit more dead code to remove, but we can do that in a new PR if you want.

Comment thread src/lib/platform/MSWindowsWatchdog.cpp
nbolton
nbolton requested changes Apr 21, 2025
View reviewed changes

@nbolton nbolton left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Actually, I think this log could be improved.

Comment thread src/lib/platform/MSWindowsWatchdog.cpp Outdated
nbolton
nbolton reviewed Apr 21, 2025
View reviewed changes
Comment thread src/lib/platform/MSWindowsWatchdog.cpp Outdated
@sithlord48
sithlord48 requested a review from nbolton April 21, 2025 23:08
@sithlord48

sithlord48 commented Apr 21, 2025

Copy link
Copy Markdown
Member Author

I've removed those additional items, If you see anymore lmk

nbolton
nbolton approved these changes Apr 22, 2025
View reviewed changes

@nbolton nbolton left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Tested Windows client at:

  • startup login screen
  • lock screen
  • UAC prompt

Working well 👍

@nbolton
nbolton merged commit 71b6f07 into master Apr 22, 2025
@nbolton
nbolton deleted the rmSwitchonDesk branch April 22, 2025 09:00
@nbolton nbolton mentioned this pull request Apr 25, 2025
Closed
This was referenced Apr 25, 2025
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nbolton nbolton nbolton approved these changes

Assignees

No one assigned

Labels

🪟 windows This issue affects Windows

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Remove Windows auto-elevate option through --stop-on-desk-switch

2 participants

@sithlord48 @nbolton