talons

commit b88955da552b8d5e721a108bd5615f989b8e5e22
parent 3dfc764e34a658e911674ad4a0a1ab1bab60e5d7
Author: Andrej Kacian <ticho@claws-mail.org>
Date:   Wed, 10 Feb 2016 19:46:11 +0100

Another logic fix for handling master password change dialog.

Diffstat:
M
src/prefs_other.c
 | 
9
+++++++++

1 file changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/prefs_other.c b/src/prefs_other.c
@@ -716,6 +716,15 @@ static void prefs_other_save(PrefsPage *_page)
 			GTK_TOGGLE_BUTTON(page->checkbtn_use_password))
 			&& master_password_is_set()) {
 		master_password_change(NULL);
+
+		/* In case user did not finish the password change process
+		 * (e.g. did not enter a correct current master password),
+		 * we need to enable the "use master password" checkbox again,
+		 * since the old master password is still valid. */
+		if (master_password_is_set()) {
+			gtk_toggle_button_set_active(
+				GTK_TOGGLE_BUTTON(page->checkbtn_use_password), TRUE);
+		}
 	}
 
 	if (gtk_toggle_button_get_active(