summaryrefslogtreecommitdiff
path: root/setup_native
diff options
context:
space:
mode:
authorDirk Völzke <dv@openoffice.org>2009-10-21 09:09:27 +0000
committerDirk Völzke <dv@openoffice.org>2009-10-21 09:09:27 +0000
commit23a9733f3d2ad0eae51f6bde21bdb910e3299898 (patch)
tree550a7462a16aba6cc3af4aeb4098f1f4f1fbac78 /setup_native
parent7bf1381f02e277dea45e08aed8b2d28bf8360f31 (diff)
#i104421# Don't report running office when path to office is infalid
Diffstat (limited to 'setup_native')
-rwxr-xr-xsetup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx b/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
index 7b612abec..0fe8bbdae 100755
--- a/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
@@ -257,6 +257,9 @@ extern "C" UINT __stdcall IsOfficeRunning( MSIHANDLE handle )
// When there is no program folder, there could be no running office
if ( dwError == ERROR_FILE_NOT_FOUND )
return ERROR_SUCCESS;
+ if ( dwError == ERROR_PATH_NOT_FOUND )
+ return ERROR_SUCCESS;
+
// The destination folder should never exist, don't know what to do here
if ( dwError == ERROR_ALREADY_EXISTS )
return ERROR_SUCCESS;