diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-08-17 12:35:41 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-08-17 12:35:41 +0000 |
| commit | c7f37c4a61e90e005d8bb9b8ace54aea7b422d0c (patch) | |
| tree | d9af3102a15c6cde30c2925fd6f4bb58fe4a18b0 | |
| parent | 9e0fe08e5efb491cfabb0adf265928e81c402d60 (diff) | |
INTEGRATION: CWS qssyncterm (1.4.180); FILE MERGED
2007/08/02 14:08:25 hro 1.4.180.1: #149979# Wait at most 30 seconds to give Quickstarter enough time to terminate before setup continues
| -rw-r--r-- | setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx b/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx index 18daa89e7..c0e835387 100644 --- a/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx +++ b/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx @@ -4,9 +4,9 @@ * * $RCSfile: shutdown_quickstart.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-07 16:34:27 $ + * last change: $Author: ihi $ $Date: 2007-08-17 13:35:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -58,6 +58,15 @@ static BOOL CALLBACK EnumWindowsProc( HWND hWnd, LPARAM lParam ) if ( uMsgShutdownQuickstart ) SendMessageA( hWnd, uMsgShutdownQuickstart, 0, 0 ); + + + HANDLE hProcess = OpenProcess( SYNCHRONIZE, FALSE, dwProcessId ); + + if ( hProcess ) + { + WaitForSingleObject( hProcess, 30000 ); // Wait at most 30 seconds for process to terminate + CloseHandle( hProcess ); + } return FALSE; } |