2 files changed, 9 insertions, 0 deletions
diff --git a/src/Setup/Setup.c b/src/Setup/Setup.c
index a3d14c65..3da3609d 100644
--- a/src/Setup/Setup.c
+++ b/src/Setup/Setup.c
@@ -59,6 +59,7 @@ BOOL bMakePackage = FALSE;
 BOOL bDone = FALSE;
 BOOL Rollback = FALSE;
 BOOL bUpgrade = FALSE;
+BOOL bUpdateRescueDisk = FALSE;
 BOOL bDowngrade = FALSE;
 BOOL SystemEncryptionUpdate = FALSE;
 BOOL PortableMode = FALSE;
@@ -1688,7 +1689,10 @@ BOOL UpgradeBootLoader (HWND hwndDlg)
 			bootEnc.InstallBootLoader (true);
 
 			if (bootEnc.GetInstalledBootLoaderVersion() <= TC_RESCUE_DISK_UPGRADE_NOTICE_MAX_VERSION)
+			{
+				bUpdateRescueDisk = TRUE;
 				Info (IsHiddenOSRunning() ? "BOOT_LOADER_UPGRADE_OK_HIDDEN_OS" : "BOOT_LOADER_UPGRADE_OK", hwndDlg);
+			}
 		}
 		return TRUE;
 	}
@@ -2276,6 +2280,10 @@ void DoInstall (void *arg)
 				if (bUpgrade)
 				{
 					SavePostInstallTasksSettings (TC_POST_INSTALL_CFG_RELEASE_NOTES);
+					if (bUpdateRescueDisk)
+					{
+						SavePostInstallTasksSettings (TC_POST_INSTALL_CFG_RESCUE_DISK);
+					}
 				}
 				else if (bPossiblyFirstTimeInstall)
 				{
diff --git a/src/Setup/Setup.h b/src/Setup/Setup.h
index 07655060..b29ad14a 100644
--- a/src/Setup/Setup.h
+++ b/src/Setup/Setup.h
@@ -95,6 +95,7 @@ BOOL CALLBACK InstallDlgProc ( HWND hwndDlg , UINT msg , WPARAM wParam , LPARAM
 extern BOOL bDevm;
 extern BOOL Rollback;
 extern BOOL bUpgrade;
+extern BOOL bUpdateRescueDisk;
 extern BOOL bPossiblyFirstTimeInstall;
 extern BOOL bRepairMode;
 extern BOOL bReinstallMode;