diff options
| author | Fredrik Gustafsson <[email protected]> | 2012-08-27 15:04:09 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2012-08-27 15:04:09 +0200 |
| commit | 497af1e240365936dff995831a2644243cb83878 (patch) | |
| tree | 89ea5d55da80ab5a71db8cafcb2fe34ef746279d /erts/etc | |
| parent | fc5a483902f56839b5e331d5362c66cc6d35bed9 (diff) | |
| parent | e6b62480201b744bbac2d7b07618202c40e2912c (diff) | |
| download | otp-497af1e240365936dff995831a2644243cb83878.tar.gz otp-497af1e240365936dff995831a2644243cb83878.tar.bz2 otp-497af1e240365936dff995831a2644243cb83878.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/etc')
| -rw-r--r-- | erts/etc/win32/erlsrv/erlsrv_service.c | 3 | ||||
| -rw-r--r-- | erts/etc/win32/port_entry.c | 2 | ||||
| -rw-r--r-- | erts/etc/win32/start_erl.c | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/erts/etc/win32/erlsrv/erlsrv_service.c b/erts/etc/win32/erlsrv/erlsrv_service.c index 242e2905a9..8b734b0c05 100644 --- a/erts/etc/win32/erlsrv/erlsrv_service.c +++ b/erts/etc/win32/erlsrv/erlsrv_service.c @@ -104,11 +104,10 @@ static VOID WINAPI handler(DWORD control){ log_debug(buffer); switch(control){ case SERVICE_CONTROL_STOP: + case SERVICE_CONTROL_SHUTDOWN: set_stop_pending(30000,1); SetEvent(eventStop); return; - case SERVICE_CONTROL_SHUTDOWN: - return; default: reset_current(); break; diff --git a/erts/etc/win32/port_entry.c b/erts/etc/win32/port_entry.c index 49b5ad2f34..9c3e750cbc 100644 --- a/erts/etc/win32/port_entry.c +++ b/erts/etc/win32/port_entry.c @@ -45,6 +45,8 @@ extern void mainCRTStartup(void); BOOL WINAPI erl_port_default_handler(DWORD ctrl){ if(ctrl == CTRL_LOGOFF_EVENT) return TRUE; + if(ctrl == CTRL_SHUTDOWN_EVENT) + return TRUE; return FALSE; } diff --git a/erts/etc/win32/start_erl.c b/erts/etc/win32/start_erl.c index 28c8e55bd3..41b221d5bc 100644 --- a/erts/etc/win32/start_erl.c +++ b/erts/etc/win32/start_erl.c @@ -585,6 +585,9 @@ BOOL WINAPI LogoffHandlerRoutine( DWORD dwCtrlType ) if(dwCtrlType == CTRL_LOGOFF_EVENT) { return TRUE; } + if(dwCtrlType == CTRL_SHUTDOWN_EVENT) { + return TRUE; + } return FALSE; } |