From 67fc0e9b01bd1617e43a8de850214b0abbb58d9b Mon Sep 17 00:00:00 2001
From: Xadhoom <>
Date: Mon, 25 Feb 2019 12:38:24 +0000
Subject: [PATCH] Fix for StormLib

---
 3rdParty/StormLib/README             | 1 +
 3rdParty/StormLib/src/FileStream.cpp | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/3rdParty/StormLib/README b/3rdParty/StormLib/README
index c82021f1f..38a30cfe7 100644
--- a/3rdParty/StormLib/README
+++ b/3rdParty/StormLib/README
@@ -9,3 +9,4 @@ Implementation changes:
 * Use `stdcall` calling convention.
 * Use external Storm error handling (`SErrGetLastError()` etc.)
 * Convert pathnames to Unix-style slashes.
+* Bugfixes, with comment: // BUGFIX (devilutionX)
diff --git a/3rdParty/StormLib/src/FileStream.cpp b/3rdParty/StormLib/src/FileStream.cpp
index a65ea339f..99f5a4624 100644
--- a/3rdParty/StormLib/src/FileStream.cpp
+++ b/3rdParty/StormLib/src/FileStream.cpp
@@ -99,6 +99,7 @@ static bool BaseFile_Create(TFileStream * pStream)
         if(handle == -1)
         {
             nLastError = errno;
+            pStream->Base.File.hFile = INVALID_HANDLE_VALUE; // BUGFIX (devilutionX)
             return false;
         }
         
@@ -151,6 +152,7 @@ static bool BaseFile_Open(TFileStream * pStream, const TCHAR * szFileName, DWORD
         if(handle == -1)
         {
             nLastError = errno;
+            pStream->Base.File.hFile = INVALID_HANDLE_VALUE; // BUGFIX (devilutionX)
             return false;
         }
 
@@ -159,6 +161,7 @@ static bool BaseFile_Open(TFileStream * pStream, const TCHAR * szFileName, DWORD
         {
             nLastError = errno;
             close(handle);
+            pStream->Base.File.hFile = INVALID_HANDLE_VALUE; // BUGFIX (devilutionX)
             return false;
         }