-
-
Notifications
You must be signed in to change notification settings - Fork 527
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(dashboard): 🐛 Fix SteamVR launch fail for dangling ADB process #2757
base: master
Are you sure you want to change the base?
Conversation
79ddef4
to
3ea68c4
Compare
Tested by @0JXI0, ready to review |
As things stand, probably this PR shouldn't be merged. I could get some help making another PR fixing this the proper way, as suggested by @The-personified-devil |
I mean I can take a look at it tmrw, but I'm not entirely sure how to ideally handle this yet |
@The-personified-devil We would need to detect if the current alive adb server is spawned from the current process or not. if it's the local ADB installation it's always spawned by the driver, if not then it's safe to let the ADB instance live because it will not block SteamVR. the crate sysinfo should be able to tell if the parent process is SteamVR (check if adb is spawned by the current process) |
3ea68c4
to
ac295a8
Compare
ac295a8
to
0822988
Compare
if let Some(path) = adb::get_adb_path(&crate::get_filesystem_layout()) { | ||
adb::kill_server(&path).ok(); | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is alright but it would unnecessarily kill a global adb server instance. Better would be to get only the local adb path and try to kill that. But better yet would be to get the current running adb processes and kill any that is child of SteamVR (vrserver). This last solution would also be resistant to edge cases where the users installs a global adb server while running SteamVR
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
note though, i think you can't run two adb instances as well, so you kinda have to replace one instance with another anyway
No description provided.