diff options
| author | Daniil Yarancev <21169548+Yardanico@users.noreply.github.com> | 2018-01-07 21:02:00 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-07 21:02:00 +0300 |
| commit | fb44c522e6173528efa8035ecc459c84887d0167 (patch) | |
| tree | a2f5e98606be265981a5f72748896967033e23d7 /lib/pure/memfiles.nim | |
| parent | ccf99fa5ce4fe992fb80dc89271faa51456c3fa5 (diff) | |
| parent | e23ea64c41e101d4e1d933f0b015f51cc6c2f7de (diff) | |
| download | Nim-fb44c522e6173528efa8035ecc459c84887d0167.tar.gz | |
Merge pull request #1 from nim-lang/devel
upstream
Diffstat (limited to 'lib/pure/memfiles.nim')
| -rw-r--r-- | lib/pure/memfiles.nim | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/pure/memfiles.nim b/lib/pure/memfiles.nim index 9b2d25267..5c73381ff 100644 --- a/lib/pure/memfiles.nim +++ b/lib/pure/memfiles.nim @@ -257,10 +257,13 @@ proc close*(f: var MemFile) = when defined(windows): if f.wasOpened: error = unmapViewOfFile(f.mem) == 0 - lastErr = osLastError() - error = (closeHandle(f.mapHandle) == 0) or error - if f.fHandle != INVALID_HANDLE_VALUE: - error = (closeHandle(f.fHandle) == 0) or error + if not error: + error = closeHandle(f.mapHandle) == 0 + if not error and f.fHandle != INVALID_HANDLE_VALUE: + discard closeHandle(f.fHandle) + f.fHandle = INVALID_HANDLE_VALUE + if error: + lastErr = osLastError() else: error = munmap(f.mem, f.size) != 0 lastErr = osLastError() |