diff --git a/Uninstall/src/UnInstall.hpp b/Uninstall/src/UnInstall.hpp index 7306117..b871e94 100644 --- a/Uninstall/src/UnInstall.hpp +++ b/Uninstall/src/UnInstall.hpp @@ -636,11 +636,19 @@ int ExecuteEntry(int Sel, int Action, bool LowPriority) ZeroMemory(&pi, sizeof(pi)); TCHAR cmd_line[MAX_PATH*2+1], cmd_file[MAX_PATH+1], cmd_parm[MAX_PATH*2+1]; - LPCTSTR pszString = p[Sel].Keys[UninstallString]; + + LPCTSTR pszString = NULL; + if ((Action == Action_ModifyWait) || (Action == Action_Modify)) pszString = p[Sel].Keys[ModifyPath]; - else if ((Action == Action_RepairWait) || (Action == Action_Repair)) - pszString = NULL; + //else if ((Action == Action_RepairWait) || (Action == Action_Repair)) + // pszString = NULL; + else if ((Action == Action_UninstallWait) || (Action == Action_Uninstall)) + { + if (!p[Sel].WindowsInstaller) + pszString = p[Sel].Keys[UninstallString]; + } + if (pszString && !*pszString) pszString = NULL; diff --git a/Uninstall/src/WhatsNew.Rus.txt b/Uninstall/src/WhatsNew.Rus.txt index cf088d1..3b15407 100644 --- a/Uninstall/src/WhatsNew.Rus.txt +++ b/Uninstall/src/WhatsNew.Rus.txt @@ -1,4 +1,7 @@ -v1.10.12 +v1.10.13 + - '[ ] Force use MsiExec' не влияет на 'Uninstall action', всегда выполняется msiexec /x ... + +v1.10.12 - '[ ] Force use MsiExec' off by default - не запускался режим 'Repair' для MSI diff --git a/Uninstall/src/project.ini b/Uninstall/src/project.ini index 75311fa..7c7d726 100644 --- a/Uninstall/src/project.ini +++ b/Uninstall/src/project.ini @@ -2,4 +2,4 @@ MODULE = UnInstall VER_MAJOR = 1 VER_MINOR = 10 -VER_PATCH = 12 +VER_PATCH = 13