aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2014-11-05 15:35:40 +0100
committerLukas Larsson <[email protected]>2014-11-05 15:35:40 +0100
commitc48601bc9d90394ff459afe66bf9432327c774b0 (patch)
tree9020ec57a28b3db192ca060a11041bea4f19aa65 /erts/emulator
parent682a6082159568f40615f03d12d44ee70edd14c6 (diff)
parentc3baa2ad6a7877ef1c2081d50903f3e513292339 (diff)
downloadotp-c48601bc9d90394ff459afe66bf9432327c774b0.tar.gz
otp-c48601bc9d90394ff459afe66bf9432327c774b0.tar.bz2
otp-c48601bc9d90394ff459afe66bf9432327c774b0.zip
Merge branch 'lukas/erts/win32-flush-block/OTP-12291' into maint
* lukas/erts/win32-flush-block/OTP-12291: erts: Fix hanging in fd_stop on windows
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/sys/win32/sys.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/sys/win32/sys.c b/erts/emulator/sys/win32/sys.c
index 0ded6b274e..62de462b93 100644
--- a/erts/emulator/sys/win32/sys.c
+++ b/erts/emulator/sys/win32/sys.c
@@ -2190,7 +2190,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));
}
}