From 896b7144b837146e0ea0fa23707b2c9d1d0a383b Mon Sep 17 00:00:00 2001
From: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Date: Sat, 22 Mar 2014 13:37:45 +0200
Subject: [PATCH] Fix potential dtor ordering crash in file hasher

---
 src/library/fileimage.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/library/fileimage.cpp b/src/library/fileimage.cpp
index d48eda9d..ac93c3b1 100644
--- a/src/library/fileimage.cpp
+++ b/src/library/fileimage.cpp
@@ -15,8 +15,12 @@ namespace
 
 	mutex_class& global_queue_mutex()
 	{
-		static mutex_class m;
-		return m;
+		static bool init = false;
+		static mutex_class* m;
+		if(!init)
+			m = new mutex_class();
+		init = true;
+		return *m;
 	}
 
 	uint64_t calculate_headersize(uint64_t f, uint64_t h)
-- 
2.11.4.GIT