summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorisanae <14251494+isanae@users.noreply.github.com>2019-11-25 09:26:46 -0500
committerisanae <14251494+isanae@users.noreply.github.com>2019-11-25 09:26:46 -0500
commitbec112069344281cbf1c61ade2eb1b354780d074 (patch)
treec795703d4a9103acf236e48fe9c5f810692a687f
parent7380747ca9adf7c9394c83aad39bd0f0707ab1f5 (diff)
removed calls to GetOverlappedResultEx() and SetThreadDescription(), not available on windows 7
bumped to alpha7.1
-rw-r--r--src/loot.cpp12
-rw-r--r--src/version.rc2
2 files changed, 10 insertions, 4 deletions
diff --git a/src/loot.cpp b/src/loot.cpp
index a7251965..47a70596 100644
--- a/src/loot.cpp
+++ b/src/loot.cpp
@@ -159,7 +159,15 @@ private:
{
DWORD bytesRead = 0;
- if (!::GetOverlappedResultEx(m_stdout.get(), &m_ov, &bytesRead, PipeTimeout, FALSE)) {
+ const auto r = WaitForSingleObject(m_readEvent.get(), PipeTimeout);
+
+ if (r == WAIT_FAILED) {
+ const auto e = GetLastError();
+ log::error("WaitForSingleObject in AsyncPipe failed, {}", formatSystemMessage(e));
+ return {};
+ }
+
+ if (!::GetOverlappedResult(m_stdout.get(), &m_ov, &bytesRead, FALSE)) {
const auto e = GetLastError();
switch (e)
@@ -490,8 +498,6 @@ const Loot::Report& Loot::report() const
void Loot::lootThread()
{
- ::SetThreadDescription(GetCurrentThread(), L"loot");
-
try
{
m_result = false;
diff --git a/src/version.rc b/src/version.rc
index 983c1a8f..7dac7b3a 100644
--- a/src/version.rc
+++ b/src/version.rc
@@ -4,7 +4,7 @@
// Otherwise, if letters are used in VER_FILEVERSION_STR, uses the full MOBase::VersionInfo parser
// Otherwise, uses the numbers from VER_FILEVERSION and sets the release type as pre-alpha
#define VER_FILEVERSION 2,2,2,7
-#define VER_FILEVERSION_STR "2.2.2alpha7\0"
+#define VER_FILEVERSION_STR "2.2.2alpha7.1\0"
VS_VERSION_INFO VERSIONINFO
FILEVERSION VER_FILEVERSION