Skip to content

fix(dashboard): Fix issues starting ALVR on Windows - #2766

Merged
zmerp merged 6 commits into
alvr-org:masterfrom
curoviyxru:fixing-windows
Mar 22, 2025
Merged

zmerp merged 6 commits into
alvr-org:masterfrom
curoviyxru:fixing-windows

Conversation

@curoviyxru

Copy link
Copy Markdown
Contributor

No description provided.

@curoviyxru curoviyxru changed the title fix: Fix issues starting ALVR on Windows fix(dashboard): Fix issues starting ALVR on Windows Mar 21, 2025

alvr_server_io::driver_registration(&[alvr_driver_dir], true).ok();

data_sources::get_local_session_source().session_mut();

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.

This feels like a hack. But i think the original code was racey anyway. I have plans to pass the settings to the c++ side without going through the session.json file, but this will do for now

@curoviyxru curoviyxru Mar 21, 2025 •

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

session_mut() is called only when something is changed so it should be created somewhere anyway. maybe it should be triggered by making default server_version not equal to current version.

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.

I'm reading now your message on Discord, you probably should move the session initialization back to the driver, in place of the path backup mechanism

Comment on lines 108 to -110
pub fn new(root: &Path) -> Option<Self> {
let root = root.canonicalize().ok()?;

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.

Given that now Layout::new() is now infallible, the Option<> should be removed from the return type. Check the changes of the faulty commit to see all the places that should be reverted

@zmerp
zmerp merged commit 0860c5e into alvr-org:master Mar 22, 2025
@curoviyxru
curoviyxru deleted the fixing-windows branch March 22, 2025 23:25
zmerp pushed a commit that referenced this pull request Jun 27, 2025
* fix: Fix file paths on Windows

* fix: Save session file before starting SteamVR

* chore: Format code

* refactor: Remove Option from Layout::new

* refactor: Move session saving to environment init

* chore: Add comment for session saving
@zmerp zmerp mentioned this pull request Jun 28, 2025
zmerp pushed a commit that referenced this pull request Jun 30, 2025
* fix: Fix file paths on Windows

* fix: Save session file before starting SteamVR

* chore: Format code

* refactor: Remove Option from Layout::new

* refactor: Move session saving to environment init

* chore: Add comment for session saving
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants