aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Engelbrecht <[email protected]>2023-08-22 13:19:39 +0200
committerGitHub <[email protected]>2023-08-22 13:19:39 +0200
commit7006194bda55527c36e7d69e509de30ca1c200f3 (patch)
tree41cf094bf111d80327aa2d060fabc5200a9fefc9
parentchangelog version (diff)
downloadzen-7006194bda55527c36e7d69e509de30ca1c200f3.tar.xz
zen-7006194bda55527c36e7d69e509de30ca1c200f3.zip
Fix construction order in OpenProcessCache (#374)
-rw-r--r--CHANGELOG.md1
-rw-r--r--src/zenutil/include/zenutil/openprocesscache.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 152bc1674..66100dc23 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
##
+- Bugfix: Fix construction order in OpenProcessCache to avoid crash in OpenProcessCache::GcWorker
## 0.2.17
- Feature: Add `oplog-mirror` command to Zen command line tool. It can be used to export the contents of an oplog as files. Currently it will export all files, filtering options will be added at a later time
diff --git a/src/zenutil/include/zenutil/openprocesscache.h b/src/zenutil/include/zenutil/openprocesscache.h
index 3db4e0b42..5262d62c0 100644
--- a/src/zenutil/include/zenutil/openprocesscache.h
+++ b/src/zenutil/include/zenutil/openprocesscache.h
@@ -31,8 +31,8 @@ private:
RwLock m_SessionsLock;
std::unordered_map<Oid, Process, Oid::Hasher> m_Sessions;
- std::thread m_GcThread;
Event m_GcExitEvent;
+ std::thread m_GcThread;
#endif // ZEN_PLATFORM_WINDOWS
};