diff options
| author | Lukas Larsson <[email protected]> | 2014-11-05 15:37:03 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2014-11-05 15:37:03 +0100 |
| commit | 2863d7a23622da445b0562b051b4eb8fb048f7fe (patch) | |
| tree | 4c77a641b1ae301f62dc87076849a6972727db5c /erts | |
| parent | 39cd804e0a04cad11daabcc671ea71594e96f47b (diff) | |
| parent | c48601bc9d90394ff459afe66bf9432327c774b0 (diff) | |
| download | otp-2863d7a23622da445b0562b051b4eb8fb048f7fe.tar.gz otp-2863d7a23622da445b0562b051b4eb8fb048f7fe.tar.bz2 otp-2863d7a23622da445b0562b051b4eb8fb048f7fe.zip | |
Merge branch 'maint'
* maint:
erts: Fix hanging in fd_stop on windows
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/sys/win32/sys.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/sys/win32/sys.c b/erts/emulator/sys/win32/sys.c index ae44c8424f..164ef95629 100644 --- a/erts/emulator/sys/win32/sys.c +++ b/erts/emulator/sys/win32/sys.c @@ -2184,7 +2184,7 @@ static void fd_stop(ErlDrvData data) ASSERT(dp->out.flushEvent); SetEvent(dp->out.flushEvent); } while (WaitForSingleObject(dp->out.flushReplyEvent, 10) == WAIT_TIMEOUT - || !(dp->out.flags & DF_THREAD_FLUSHED)); + && !(dp->out.flags & DF_THREAD_FLUSHED)); } } |