Skip to content

Commit accbea1

Browse files
authored
Merge pull request #37 from sireliah/fix-dialog-close-event
Fix problematic close event for the firewall dialog
2 parents 3d45b14 + 122d208 commit accbea1

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/dnd/dialogs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ impl FirewallDialog {
8989
}
9090

9191
pub fn close(&self) {
92-
self.0.hide();
9392
self.0.close();
93+
self.0.hide();
9494
}
9595
}

src/dnd/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ fn handle_firewall(window: &gtk::ApplicationWindow) -> Result<(), Box<dyn Error>
149149
// Please note that on some OS'es like Ubuntu, polkit will require password for querying firewalld D-Bus interface.
150150
let check_dialog = FirewallDialog::new_for_check(window);
151151
let check_response = check_dialog.run();
152-
check_dialog.close();
153152

154153
match check_response {
155154
gtk::ResponseType::Yes => {
@@ -159,6 +158,7 @@ fn handle_firewall(window: &gtk::ApplicationWindow) -> Result<(), Box<dyn Error>
159158
if required_services.0 || required_services.1 {
160159
let dialog = FirewallDialog::new_for_config(window, &config);
161160
let response = dialog.run();
161+
check_dialog.close();
162162
match response {
163163
gtk::ResponseType::Yes => firewall.handle(required_services)?,
164164
gtk::ResponseType::No => info!("Not checking firewall configuration"),

0 commit comments

Comments
 (0)