Fix a logic error in handling results of master password change dialog.

diff --git a/src/prefs_other.c b/src/prefs_other.c
index 09a4b6cacc6b68f750136fb707b70912acf52a50..01a6f54c82e2f426d7ca6a0175a65c21100f594f 100644 (file)
--- a/src/prefs_other.c
+++ b/src/prefs_other.c
@@ -722,6 +722,13 @@ static void prefs_other_save(PrefsPage *_page)
                        GTK_TOGGLE_BUTTON(page->checkbtn_use_password))
                        && !master_password_is_set()) {
                master_password_change_dialog();
                        GTK_TOGGLE_BUTTON(page->checkbtn_use_password))
                        && !master_password_is_set()) {
                master_password_change_dialog();

+
+               /* In case user cancelled the password change dialog, we need
+                * to disable the "use master password" checkbox. */
+               if (!master_password_is_set()) {
+                       gtk_toggle_button_set_active(
+                               GTK_TOGGLE_BUTTON(page->checkbtn_use_password), FALSE);
+               }

        }
 
        prefs_common.use_master_password =
        }
 
        prefs_common.use_master_password =