Merge pull request louis-e#290 from TheComputerGuy96/misc-fixes

Miscellaneous fixes
TheComputerGuy96 · Jan 15, 2025 · 3084985 · 3084985
2 parents f7e917e + 8221da4
commit 3084985
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/gui-src/css/styles.css b/gui-src/css/styles.css
@@ -186,6 +186,7 @@ button:hover {
   button {
     color: #ffffff;
     background-color: #0f0f0f98;
+    border-style: inherit;
   }
   button:active {
     background-color: #0f0f0f69;

diff --git a/gui-src/js/main.js b/gui-src/js/main.js
@@ -1,6 +1,11 @@
 import { licenseText } from './license.js';
 
-const { invoke } = window.__TAURI__.core;
+if (window.__TAURI__) {
+  const { invoke } = window.__TAURI__.core;
+} else {
+  function dummyFunc() {}
+  window.__TAURI__ = { event: { listen: dummyFunc } };
+}
 
 // Initialize elements and start the demo progress
 window.addEventListener("DOMContentLoaded", async () => {
@@ -447,7 +452,7 @@ function handleWorldSelectionError(errorCode) {
   document.getElementById('selected-world').textContent = errorMessage;
   document.getElementById('selected-world').style.color = "#fa7878";
   worldPath = "";
-  console.error(error);
+  console.error(errorCode);
 }
 
 let generationButtonEnabled = true;

diff --git a/src/main.rs b/src/main.rs
@@ -130,6 +130,13 @@ fn main() {
             std::process::exit(1);
         }));
 
+        // Workaround WebKit2GTK issue with NVIDIA drivers (likely explicit sync related?)
+        // Source: https://github.com/tauri-apps/tauri/issues/10702 (TODO: Remove this later)
+        #[cfg(target_os = "linux")]
+        unsafe {
+            env::set_var("WEBKIT_DISABLE_DMABUF_RENDERER", "1");
+        }
+
         tauri::Builder::default()
             .plugin(
                 LogBuilder::default()