From 486dbd7cbb5177a2e6ec89989bbde8298e960116 Mon Sep 17 00:00:00 2001 From: Elias Projahn Date: Tue, 2 Feb 2021 09:39:47 +0100 Subject: [PATCH] Use weak references in some closures --- src/dialogs/login_dialog.rs | 6 +++--- src/dialogs/register.rs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/dialogs/login_dialog.rs b/src/dialogs/login_dialog.rs index 44d00fb..0881493 100644 --- a/src/dialogs/login_dialog.rs +++ b/src/dialogs/login_dialog.rs @@ -40,11 +40,11 @@ impl Screen<(), LoginData> for LoginDialog { // Connect signals and callbacks - cancel_button.connect_clicked(clone!(@strong this => move |_| { + cancel_button.connect_clicked(clone!(@weak this => move |_| { this.handle.pop(None); })); - login_button.connect_clicked(clone!(@strong this => move |_| { + login_button.connect_clicked(clone!(@weak this => move |_| { this.widget.set_visible_child_name("loading"); let data = LoginData { @@ -65,7 +65,7 @@ impl Screen<(), LoginData> for LoginDialog { }); })); - register_button.connect_clicked(clone!(@strong this => move |_| { + register_button.connect_clicked(clone!(@weak this => move |_| { let context = glib::MainContext::default(); let clone = this.clone(); context.spawn_local(async move { diff --git a/src/dialogs/register.rs b/src/dialogs/register.rs index cd0fb7e..012ca34 100644 --- a/src/dialogs/register.rs +++ b/src/dialogs/register.rs @@ -50,11 +50,11 @@ impl Screen<(), LoginData> for RegisterDialog { // Connect signals and callbacks - cancel_button.connect_clicked(clone!(@strong this => move |_| { + cancel_button.connect_clicked(clone!(@weak this => move |_| { this.handle.pop(None); })); - register_button.connect_clicked(clone!(@strong this => move |_| { + register_button.connect_clicked(clone!(@weak this => move |_| { let password = this.password_entry.get_text().unwrap().to_string(); let repeat = this.repeat_password_entry.get_text().unwrap().to_string();