Просмотр исходного кода

fix(desktop): correct module name for linux_display in main.rs (#12862)

Luke Parker 2 недель назад
Родитель
Сommit
3d6fb29f0c
2 измененных файлов с 2 добавлено и 5 удалено
  1. 1 1
      packages/desktop/src-tauri/src/lib.rs
  2. 1 4
      packages/desktop/src-tauri/src/main.rs

+ 1 - 1
packages/desktop/src-tauri/src/lib.rs

@@ -3,7 +3,7 @@ mod constants;
 #[cfg(windows)]
 #[cfg(windows)]
 mod job_object;
 mod job_object;
 #[cfg(target_os = "linux")]
 #[cfg(target_os = "linux")]
-mod linux_display;
+pub mod linux_display;
 mod markdown;
 mod markdown;
 mod server;
 mod server;
 mod window_customizer;
 mod window_customizer;

+ 1 - 4
packages/desktop/src-tauri/src/main.rs

@@ -2,9 +2,6 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
 
 // borrowed from https://github.com/skyline69/balatro-mod-manager
 // borrowed from https://github.com/skyline69/balatro-mod-manager
-#[cfg(target_os = "linux")]
-mod display;
-
 #[cfg(target_os = "linux")]
 #[cfg(target_os = "linux")]
 fn configure_display_backend() -> Option<String> {
 fn configure_display_backend() -> Option<String> {
     use std::env;
     use std::env;
@@ -26,7 +23,7 @@ fn configure_display_backend() -> Option<String> {
         return None;
         return None;
     }
     }
 
 
-    let prefer_wayland = display::read_wayland().unwrap_or(false);
+    let prefer_wayland = opencode_lib::linux_display::read_wayland().unwrap_or(false);
     let allow_wayland = prefer_wayland
     let allow_wayland = prefer_wayland
         || matches!(
         || matches!(
             env::var("OC_ALLOW_WAYLAND"),
             env::var("OC_ALLOW_WAYLAND"),