From fef77bcd3eb8533ad7c8377beb515c85a7560167 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 24 Dec 2012 13:10:48 +0000 Subject: [PATCH] =?UTF-8?q?Popravil=20sem=20pogoj=20za=20odstranitev,=20da?= =?UTF-8?q?=20pri=20nadgradnji=20programskega=20paketa=20odstranitev=20pre?= =?UTF-8?q?j=C5=A1nje=20verzije=20ne=20odstrani=20ve=C4=8D=20opravila,=20k?= =?UTF-8?q?i=20ga=20je=20ravnokar=20ustvarila=20nova=20verzija.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MSICALib/MSITSCA.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MSICALib/MSITSCA.cpp b/MSICALib/MSITSCA.cpp index 53adbaa..4d85c03 100644 --- a/MSICALib/MSITSCA.cpp +++ b/MSICALib/MSITSCA.cpp @@ -113,7 +113,7 @@ UINT MSITSCA_API EvaluateScheduledTasks(MSIHANDLE hInstall) uiResult = ::MsiRecordFormatStringW(hInstall, hRecord, 2, sDisplayName); if (iAction >= INSTALLSTATE_LOCAL) { - // Installing component. Add the task. + // Component is or should be installed. Create the task. PMSIHANDLE hViewTT; CMSITSCAOpCreateTask *opCreateTask = new CMSITSCAOpCreateTask(sDisplayName, MSITSCA_TASK_TICK_SIZE); assert(opCreateTask); @@ -136,8 +136,8 @@ UINT MSITSCA_API EvaluateScheduledTasks(MSIHANDLE hInstall) break; olExecute.AddTail(opCreateTask); - } else { - // Removing component. Remove the task. + } else if (iInstalled >= INSTALLSTATE_LOCAL && iAction >= INSTALLSTATE_ADVERTISED) { + // Component is installed, but should be degraded to advertised. Delete the task. olExecute.AddTail(new CMSITSCAOpDeleteTask(sDisplayName, MSITSCA_TASK_TICK_SIZE)); }