aboutsummaryrefslogtreecommitdiffstats
path: root/src/ephy-window.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/ephy-window.c')
-rw-r--r--src/ephy-window.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 62a874108..6f9985f15 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -4535,16 +4535,14 @@ ephy_window_close (EphyWindow *window)
return FALSE;
}
- if (g_settings_get_boolean (EPHY_SETTINGS_MAIN,
- EPHY_PREFS_WARN_ON_CLOSE_UNSUBMITTED_DATA))
+ if (!window->priv->force_close &&
+ g_settings_get_boolean (EPHY_SETTINGS_MAIN,
+ EPHY_PREFS_WARN_ON_CLOSE_UNSUBMITTED_DATA) &&
+ gtk_notebook_get_n_pages (window->priv->notebook) > 0)
{
- if (!window->priv->force_close &&
- gtk_notebook_get_n_pages (window->priv->notebook) > 0)
- {
- ephy_window_check_modified_forms (window);
- /* stop window close */
- return FALSE;
- }
+ ephy_window_check_modified_forms (window);
+ /* stop window close */
+ return FALSE;
}
if (window_has_ongoing_downloads (window) && confirm_close_with_downloads (window) == FALSE)