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/emulator/sys/win32 | |
| 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/emulator/sys/win32')
| -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; } |