pogmommy/eww
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hotfix: fix panic because of deallocated GTK widget being called in handler (fixes #478)

Browse source
This commit is contained in:
elkowar 2022-07-27 18:49:58 +02:00
parent d8bb8c4142
commit aac4c3aef4
No known key found for this signature in database
GPG key ID: E321AD71B1D1F27F
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crates/eww/src/widgets/def_widget_macro.rs
View file

@ -43,9 +43,13 @@ macro_rules! def_widget {
crate::state::scope::Listener { crate::state::scope::Listener {
needed_variables: required_vars, needed_variables: required_vars,
f: Box::new({ f: Box::new({
// create a weak reference to the widget, such that this listener doesn't prevent the actual widget from
// getting deallocated (garbage collected by the gtk runtime)
let $gtk_widget = gdk::glib::clone::Downgrade::downgrade(&$gtk_widget); let $gtk_widget = gdk::glib::clone::Downgrade::downgrade(&$gtk_widget);
move |$scope_graph, values| { move |$scope_graph, values| {
let $gtk_widget = gdk::glib::clone::Upgrade::upgrade(&$gtk_widget).unwrap(); // TODO when this fails, shouldn't we technically remove the listener somehow? Need to analyze when exactly this happens.
let $gtk_widget = gdk::glib::clone::Upgrade::upgrade(&$gtk_widget)
.context("Couldn't upgrade reference, widget got deallocated")?;
// values is a map of all the variables that are required to evaluate the // values is a map of all the variables that are required to evaluate the
// attributes expression. // attributes expression.