mirrors/envision
0
0
Fork 0
mirror of https://gitlab.com/gabmus/envision.git synced 2025-08-03 06:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: skip managing active runtime for wivrn

Browse source
This commit is contained in:
Gabriele Musco 2024-11-29 19:44:07 +01:00
commit 27ede860df
No known key found for this signature in database
GPG key ID: 1068D795C80E51DE
1 changed files with 22 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/ui/app.rs
View file

@ -174,15 +174,18 @@ impl App {
); );
return; return;
} }
if let Err(e) = set_current_active_runtime_to_profile(&prof) { // wivrn takes care of replacing active_runtime.json
alert( if prof.xrservice_type != XRServiceType::Wivrn {
"Failed to start XR Service", if let Err(e) = set_current_active_runtime_to_profile(&prof) {
Some(&format!( alert(
"Error setting current active runtime to profile: {e}" "Failed to start XR Service",
)), Some(&format!(
Some(&self.app_win.clone().upcast::<gtk::Window>()), "Error setting current active runtime to profile: {e}"
); )),
return; Some(&self.app_win.clone().upcast::<gtk::Window>()),
);
return;
}
} }
if let Err(e) = set_current_openvrpaths_to_profile(&prof) { if let Err(e) = set_current_openvrpaths_to_profile(&prof) {
alert( alert(
@ -244,13 +247,17 @@ impl App {
} }
pub fn restore_openxr_openvr_files(&self) { pub fn restore_openxr_openvr_files(&self) {
let prof = self.get_selected_profile();
restore_runtime_entrypoint(); restore_runtime_entrypoint();
if let Err(e) = set_current_active_runtime_to_steam() { // wivrn should take care of this
alert( if prof.xrservice_type != XRServiceType::Wivrn {
"Could not restore Steam active runtime", if let Err(e) = set_current_active_runtime_to_steam() {
Some(&format!("{e}")), alert(
Some(&self.app_win.clone().upcast::<gtk::Window>()), "Could not restore Steam active runtime",
); Some(&format!("{e}")),
Some(&self.app_win.clone().upcast::<gtk::Window>()),
);
}
} }
if let Err(e) = set_current_openvrpaths_to_steam() { if let Err(e) = set_current_openvrpaths_to_steam() {
alert( alert(