From: Andrej Kacian <ticho@claws-mail.org>
Date: Wed, 10 Feb 2016 17:31:25 +0000 (+0100)
Subject: Fix a logic error in handling results of master password change dialog.
X-Git-Tag: 3.14.0~177
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=3dfc764e34a658e911674ad4a0a1ab1bab60e5d7

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 09a4b6cac..01a6f54c8 100644
--- 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();
+
+		/* 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 =