Skip to content

Commit

Permalink
Merge pull request #1208 from zecakeh/action-map-weak
Browse files Browse the repository at this point in the history
gio: Use weak reference to ActionMap when adding action entries
  • Loading branch information
sdroege committed Oct 23, 2023
2 parents 90f24bd + 133f383 commit 2cb955e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions gio/src/action_map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ pub trait ActionMapExtManual: sealed::Sealed + IsA<ActionMap> {
};
let action_map = self.as_ref();
if let Some(callback) = entry.activate {
action.connect_activate(clone!(@strong action_map => move |action, state| {
action.connect_activate(clone!(@weak action_map => move |action, state| {
// safe to unwrap as O: IsA<ActionMap>
callback(action_map.downcast_ref::<Self>().unwrap(), action, state);
}));
}
if let Some(callback) = entry.change_state {
action.connect_change_state(clone!(@strong action_map => move |action, state| {
action.connect_change_state(clone!(@weak action_map => move |action, state| {
// safe to unwrap as O: IsA<ActionMap>
callback(action_map.downcast_ref::<Self>().unwrap(), action, state);
}));
Expand Down

0 comments on commit 2cb955e

Please sign in to comment.