3 files changed, 56 insertions, 5 deletions
diff --git a/src/Mount/Favorites.cpp b/src/Mount/Favorites.cpp
index 382b238d..50842a35 100644
--- a/src/Mount/Favorites.cpp
+++ b/src/Mount/Favorites.cpp
@@ -659,7 +659,7 @@ namespace VeraCrypt
 	}
 
 
-	static bool SaveFavoriteVolumes (HWND hwndDlg, const vector <FavoriteVolume> &favorites, bool systemFavorites)
+	bool SaveFavoriteVolumes (HWND hwndDlg, const vector <FavoriteVolume> &favorites, bool systemFavorites)
 	{
 		FILE *f;
 		int cnt = 0;
diff --git a/src/Mount/Favorites.h b/src/Mount/Favorites.h
index 3a0a771b..5d823ccd 100644
--- a/src/Mount/Favorites.h
+++ b/src/Mount/Favorites.h
@@ -53,6 +53,7 @@ namespace VeraCrypt
 	};
 
 	extern vector <FavoriteVolume> FavoriteVolumes;
+	extern vector <FavoriteVolume> SystemFavoriteVolumes;
 	extern list <FavoriteVolume> FavoritesOnArrivalMountRequired;
 	extern list <FavoriteVolume> FavoritesMountedOnArrivalStillConnected;
 	extern HMENU FavoriteVolumesMenu;
@@ -67,7 +68,7 @@ namespace VeraCrypt
 	void LoadFavoriteVolumes (vector <FavoriteVolume> &favorites, bool systemFavorites, bool noUacElevation = false);
 	static void OnFavoriteVolumesUpdated ();
 	BOOL OrganizeFavoriteVolumes (HWND hwndDlg, bool systemFavorites, const FavoriteVolume &newFavorite = FavoriteVolume());
-	static bool SaveFavoriteVolumes (HWND hwndDlg, const vector <FavoriteVolume> &favorites, bool systemFavorites);
+	bool SaveFavoriteVolumes (HWND hwndDlg, const vector <FavoriteVolume> &favorites, bool systemFavorites);
 	static void SetControls (HWND hwndDlg, const FavoriteVolume &favorite, bool systemFavoritesMode, bool enable = true);
 	static void SetFavoriteVolume (HWND hwndDlg, FavoriteVolume &favorite, bool systemFavoritesMode);
 	void UpdateDeviceHostedFavoriteVolumes ();
diff --git a/src/Mount/Mount.c b/src/Mount/Mount.c
index 88dbfa5d..d5521725 100644
--- a/src/Mount/Mount.c
+++ b/src/Mount/Mount.c
@@ -1787,6 +1787,7 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 {
 	static KeyFilesDlgParam newKeyFilesParam;
 	static BOOL PinValueChangedWarning = FALSE;
+	static int* NewPimValuePtr = NULL;
 
 	WORD lw = LOWORD (wParam);
 	WORD hw = HIWORD (wParam);
@@ -1800,6 +1801,8 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 			int i;
 			WipeAlgorithmId headerWipeMode = TC_WIPE_3_DOD_5220;
 
+			NewPimValuePtr = (int*) lParam;
+
 			PinValueChangedWarning = FALSE;
 
 			ZeroMemory (&newKeyFilesParam, sizeof (newKeyFilesParam));
@@ -2337,6 +2340,15 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 			ShowWaitDialog(hwndDlg, TRUE, ChangePwdWaitThreadProc, &changePwdParam);
 
 err:
+			// notify the caller in case the PIM has changed
+			if (NewPimValuePtr)
+			{
+				if (pin != old_pin)
+					*NewPimValuePtr = pin;
+				else
+					*NewPimValuePtr = -1;
+			}
+
 			burn (&oldPassword, sizeof (oldPassword));
 			burn (&newPassword, sizeof (newPassword));
 			burn (&old_pin, sizeof(old_pin));
@@ -4691,6 +4703,7 @@ static BOOL MountAllDevices (HWND hwndDlg, BOOL bPasswordPrompt)
 static void ChangePassword (HWND hwndDlg)
 {
 	INT_PTR result;
+	int newPimValue = -1;
 	
 	GetWindowText (GetDlgItem (hwndDlg, IDC_VOLUME), szFileName, sizeof (szFileName));
 	if (IsMountedVolume (szFileName))
@@ -4707,8 +4720,8 @@ static void ChangePassword (HWND hwndDlg)
 
 	bSysEncPwdChangeDlgMode = FALSE;
 
-	result = DialogBoxW (hInst, MAKEINTRESOURCEW (IDD_PASSWORDCHANGE_DLG), hwndDlg,
-		(DLGPROC) PasswordChangeDlgProc);
+	result = DialogBoxParamW (hInst, MAKEINTRESOURCEW (IDD_PASSWORDCHANGE_DLG), hwndDlg,
+		(DLGPROC) PasswordChangeDlgProc, (LPARAM) &newPimValue);
 
 	if (result == IDOK)
 	{
@@ -4725,7 +4738,44 @@ static void ChangePassword (HWND hwndDlg)
 
 		case PCDM_CHANGE_PASSWORD:
 		default:
-			Info ("PASSWORD_CHANGED", hwndDlg);
+			{
+				Info ("PASSWORD_CHANGED", hwndDlg);
+				if (newPimValue != -1)
+				{
+					// update the encoded volue in favorite XML if found
+					bool bFavoriteFound = false;
+					for (vector <FavoriteVolume>::iterator favorite = FavoriteVolumes.begin();
+						favorite != FavoriteVolumes.end(); favorite++)
+					{
+						if (favorite->Path == szFileName)
+						{
+							bFavoriteFound = true;
+							favorite->Pin = newPimValue;
+							SaveFavoriteVolumes (hwndDlg, FavoriteVolumes, false);
+							break;
+						}
+					}
+
+					if (!bFavoriteFound)
+					{
+						for (vector <FavoriteVolume>::iterator favorite = SystemFavoriteVolumes.begin();
+							favorite != SystemFavoriteVolumes.end(); favorite++)
+						{
+							if (favorite->Path == szFileName)
+							{
+								bFavoriteFound = true;
+								favorite->Pin = newPimValue;
+								
+								if (AskYesNo("FAVORITE_PIM_CHANGED", hwndDlg) == IDYES)
+								{
+									SaveFavoriteVolumes (hwndDlg, SystemFavoriteVolumes, true);
+								}
+								break;
+							}
+						}
+					}
+				}
+			}
 		}
 	}
 }