From cd1c8c8ee6b1ca09f417393cf48dec9db07b44ef Mon Sep 17 00:00:00 2001 From: "ssu%netscape.com" Date: Sat, 4 May 2002 00:18:54 +0000 Subject: [PATCH] fixing bug 141858 - unexpected setup\setup.exe error message after installing browser git-svn-id: svn://10.0.0.236/trunk@120759 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpinstall/wizard/windows/setup/extra.c | 2 ++ mozilla/xpinstall/wizard/windows/setup/ifuncns.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mozilla/xpinstall/wizard/windows/setup/extra.c b/mozilla/xpinstall/wizard/windows/setup/extra.c index 76896e911f0..9c27376c664 100644 --- a/mozilla/xpinstall/wizard/windows/setup/extra.c +++ b/mozilla/xpinstall/wizard/windows/setup/extra.c @@ -6730,6 +6730,8 @@ HRESULT DecryptVariable(LPSTR szVariable, DWORD dwVariableSize) GetPrivateProfileString(szLookupSection, "Path Reg Name", "", szName, sizeof(szName), szFileIniConfig); GetWinReg(hkeyRoot, szKey, szName, szBuf, sizeof(szBuf)); + if(*szBuf == '\0') + return(FALSE); GetPrivateProfileString(szLookupSection, "Strip Filename", "", szBuf2, sizeof(szBuf2), szFileIniConfig); if(lstrcmpi(szBuf2, "TRUE") == 0) diff --git a/mozilla/xpinstall/wizard/windows/setup/ifuncns.c b/mozilla/xpinstall/wizard/windows/setup/ifuncns.c index 0dfa82d064d..4c5d45f612a 100644 --- a/mozilla/xpinstall/wizard/windows/setup/ifuncns.c +++ b/mozilla/xpinstall/wizard/windows/setup/ifuncns.c @@ -1327,7 +1327,7 @@ HRESULT ProcessRunApp(DWORD dwTiming, char *szSectionPrefix) else bWait = TRUE; - if (bRunApp == TRUE) + if ((bRunApp == TRUE) && FileExists(szTarget)) { if((dwTiming == T_DEPEND_REBOOT) && (NeedReboot() == TRUE)) {