mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-02-15 07:43:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add wasOpened flag for windows, so not attempt close when unopened

Browse Source
This commit is contained in:
JamesP
2015-09-22 16:16:51 +10:00
parent b6b2750327
commit d23c697044
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/pure/memfiles.nim
View File

@@ -34,6 +34,7 @@ type
when defined(windows):
fHandle: int
mapHandle: int
wasOpened: bool
else:
handle: cint
@@ -172,6 +173,8 @@ proc open*(filename: string, mode: FileMode = fmRead,
if mappedSize != -1: result.size = min(fileSize, mappedSize).int
else: result.size = fileSize.int
result.wasOpened = true
else:
template fail(errCode: OSErrorCode, msg: expr) =
rollback()
@@ -226,7 +229,7 @@ proc close*(f: var MemFile) =
var lastErr: OSErrorCode
when defined(windows):
if f.fHandle != INVALID_HANDLE_VALUE:
if f.fHandle != INVALID_HANDLE_VALUE and wasOpened:
error = unmapViewOfFile(f.mem) == 0
lastErr = osLastError()
error = (closeHandle(f.mapHandle) == 0) or error