From 6c39fdf19a9bb8c8468d9b3f3dabfaa8cc967819 Mon Sep 17 00:00:00 2001 From: Hans Leidekker Date: Wed, 25 May 2011 10:40:19 +0200 Subject: [PATCH] msi: Don't schedule rollback actions during rollback. --- dlls/msi/action.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 50e1e31e90f..f38607f43a4 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7246,8 +7246,7 @@ static BOOL ACTION_HandleStandardAction( MSIPACKAGE *package, LPCWSTR action, UI *rc = StandardActions[i].handler( package ); ui_actioninfo( package, action, FALSE, *rc ); - if (StandardActions[i].action_rollback && - !msi_get_property_int( package->db, szRollbackDisabled, 0 )) + if (StandardActions[i].action_rollback && !package->need_rollback) { TRACE("scheduling rollback action\n"); msi_schedule_action( package, ROLLBACK_SCRIPT, StandardActions[i].action_rollback ); @@ -7484,7 +7483,6 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, if (package->need_rollback) { WARN("installation failed, running rollback script\n"); - msi_set_property( package->db, szRollbackDisabled, NULL ); execute_script( package, ROLLBACK_SCRIPT ); }