From 122d2086e1741f11eef00be7c6e73e86f3cf8ed0 Mon Sep 17 00:00:00 2001
From: sireliah <sajuukk@gmail.com>
Date: Sat, 11 Jun 2022 00:12:55 +0200
Subject: [PATCH] Fix problematic close event for the firewall dialog

---
 src/dnd/dialogs.rs | 2 +-
 src/dnd/mod.rs     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/dnd/dialogs.rs b/src/dnd/dialogs.rs
index b71f8df..a65b291 100644
--- a/src/dnd/dialogs.rs
+++ b/src/dnd/dialogs.rs
@@ -89,7 +89,7 @@ impl FirewallDialog {
     }
 
     pub fn close(&self) {
-        self.0.hide();
         self.0.close();
+        self.0.hide();
     }
 }
diff --git a/src/dnd/mod.rs b/src/dnd/mod.rs
index e5a8f09..5d811f5 100644
--- a/src/dnd/mod.rs
+++ b/src/dnd/mod.rs
@@ -149,7 +149,6 @@ fn handle_firewall(window: &gtk::ApplicationWindow) -> Result<(), Box<dyn Error>
         // Please note that on some OS'es like Ubuntu, polkit will require password for querying firewalld D-Bus interface.
         let check_dialog = FirewallDialog::new_for_check(window);
         let check_response = check_dialog.run();
-        check_dialog.close();
 
         match check_response {
             gtk::ResponseType::Yes => {
@@ -159,6 +158,7 @@ fn handle_firewall(window: &gtk::ApplicationWindow) -> Result<(), Box<dyn Error>
                 if required_services.0 || required_services.1 {
                     let dialog = FirewallDialog::new_for_config(window, &config);
                     let response = dialog.run();
+                    check_dialog.close();
                     match response {
                         gtk::ResponseType::Yes => firewall.handle(required_services)?,
                         gtk::ResponseType::No => info!("Not checking firewall configuration"),