Skip to content

Commit a414d01

Browse files
authored
Merge branch 'main' into renovate/all-minor-patch
2 parents f1224f4 + b97c734 commit a414d01

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

Cargo.lock

+2-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/kftray-tauri/src/main.rs

+12
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,18 @@ fn main() {
5252
let runtime = Arc::new(Runtime::new().expect("Failed to create a Tokio runtime"));
5353
let http_log_state = HttpLogState::new();
5454

55+
// TODO: Remove this workaround when the tauri issue is resolved
56+
// tauri Issue: https://github.com/tauri-apps/tauri/issues/9394
57+
// kftray Issue: https://github.com/hcavarsan/kftray/issues/366
58+
#[cfg(any(
59+
target_os = "linux",
60+
target_os = "freebsd",
61+
target_os = "dragonfly",
62+
target_os = "openbsd",
63+
target_os = "netbsd"
64+
))]
65+
std::env::set_var("WEBKIT_DISABLE_COMPOSITING_MODE", "1");
66+
5567
let app = tauri::Builder::default()
5668
.manage(SaveDialogState::default())
5769
.manage(AppState {

0 commit comments

Comments
 (0)