strangechoice/ironbar-fork
1
0
Fork 0
Code Pull Requests Activity

fix: some modules crashing due to recent gtk refactor

Browse Source 
Fixes a crash introduced by commit bea442e where the `await_sync` function incorrectly tried to use the current tokio runtime, which it is often outside, instead of the singleton.

Fixes #382
This commit is contained in:
Jake Stanger
2023-12-24 13:37:20 +00:00
parent 29eeefbd24
commit 80de5dd824
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.rs
View File

@@ -21,7 +21,7 @@ use glib::PropertySet;
use gtk::gdk::Display; use gtk::gdk::Display;
use gtk::prelude::*; use gtk::prelude::*;
use gtk::Application; use gtk::Application;
use tokio::runtime::{Handle, Runtime}; use tokio::runtime::Runtime;
use tokio::task::{block_in_place, JoinHandle}; use tokio::task::{block_in_place, JoinHandle};
use tracing::{debug, error, info, warn}; use tracing::{debug, error, info, warn};
use universal_config::ConfigLoader; use universal_config::ConfigLoader;
@@ -370,5 +370,5 @@ where
/// ///
/// TODO: remove all instances of this once async trait funcs are stable /// TODO: remove all instances of this once async trait funcs are stable
pub fn await_sync<F: Future>(f: F) -> F::Output { pub fn await_sync<F: Future>(f: F) -> F::Output {
block_in_place(|| Handle::current().block_on(f)) block_in_place(|| Ironbar::runtime().block_on(f))
} }