diff options
| author | Fredrik Gustafsson <[email protected]> | 2012-08-27 15:03:54 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2012-08-27 15:03:54 +0200 |
| commit | e6b62480201b744bbac2d7b07618202c40e2912c (patch) | |
| tree | dddd5d0e4e670bc120d709737eeb53e90acca5e8 /erts/emulator | |
| parent | c6fc61ffab426cc7b391eb903e7942bda809a230 (diff) | |
| parent | 03985084e42e262bac1b7c48a97c31db97348f1d (diff) | |
| download | otp-e6b62480201b744bbac2d7b07618202c40e2912c.tar.gz otp-e6b62480201b744bbac2d7b07618202c40e2912c.tar.bz2 otp-e6b62480201b744bbac2d7b07618202c40e2912c.zip | |
Merge branch 'jkl/erlsrv-graceful-shutdown/OTP-10228' into maint
* jkl/erlsrv-graceful-shutdown/OTP-10228:
erlsrv: gracefully stop emulator on Windows shutdown
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/sys/win32/sys_interrupt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/sys/win32/sys_interrupt.c b/erts/emulator/sys/win32/sys_interrupt.c index 347c31053b..a507a19480 100644 --- a/erts/emulator/sys/win32/sys_interrupt.c +++ b/erts/emulator/sys/win32/sys_interrupt.c @@ -75,11 +75,11 @@ BOOL WINAPI ctrl_handler_ignore_break(DWORD dwCtrlType) return TRUE; break; case CTRL_LOGOFF_EVENT: + case CTRL_SHUTDOWN_EVENT: if (nohup) return TRUE; /* else pour through... */ case CTRL_CLOSE_EVENT: - case CTRL_SHUTDOWN_EVENT: erl_exit(0, ""); break; } @@ -127,11 +127,11 @@ BOOL WINAPI ctrl_handler(DWORD dwCtrlType) SetEvent(erts_sys_break_event); break; case CTRL_LOGOFF_EVENT: + case CTRL_SHUTDOWN_EVENT: if (nohup) return TRUE; /* else pour through... */ case CTRL_CLOSE_EVENT: - case CTRL_SHUTDOWN_EVENT: erl_exit(0, ""); break; } |