diff options
author | Dirk Völzke <dv@openoffice.org> | 2009-10-21 09:09:27 +0000 |
---|---|---|
committer | Dirk Völzke <dv@openoffice.org> | 2009-10-21 09:09:27 +0000 |
commit | 576f2ad346b04cd078ee22b1575b715c7d41193c (patch) | |
tree | ae8a657755614bdef6fda9b9510105fb8213ec8b /setup_native | |
parent | a79a4812e4cec0a2a0711279b20af5a0f6631838 (diff) |
#i104421# Don't report running office when path to office is infalid
Diffstat (limited to 'setup_native')
-rwxr-xr-x | setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx | 3 |
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 1fe1d2335b88..70c0d9fef1e6 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; |