From f370899a8abd137376e3dd7887bf705ae4d397a1 Mon Sep 17 00:00:00 2001
From: Dmitry Panin <pank.dm@gmail.com>
Date: Tue, 19 Nov 2013 03:58:43 +0400
Subject: [PATCH] Thread-safe version of OutputCapturer

---
 JGE/include/OutputCapturer.h | 4 ++++
 JGE/include/Threading.h      | 1 -
 JGE/src/OutputCapturer.cpp   | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/JGE/include/OutputCapturer.h b/JGE/include/OutputCapturer.h
index 9e2f3d924..fe23f1e89 100644
--- a/JGE/include/OutputCapturer.h
+++ b/JGE/include/OutputCapturer.h
@@ -5,13 +5,17 @@
 #include <Qt>
 #include <string>
 #include <sstream>
+#include "Threading.h"
 
 class OutputCapturer
 {
 private:
     static std::ostringstream stream;
+    static boost::mutex mMutex;
+
 public:
     static void add(const std::string& s) {
+        boost::mutex::scoped_lock lock(mMutex);
         stream << s << "\n";
     }
     static void debugAndClear() {
diff --git a/JGE/include/Threading.h b/JGE/include/Threading.h
index fe3c79068..2c0667ce7 100644
--- a/JGE/include/Threading.h
+++ b/JGE/include/Threading.h
@@ -315,7 +315,6 @@ namespace boost
 #include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include "../include/DebugRoutines.h"
 #include "../include/JLogger.h"
 
 namespace boost
diff --git a/JGE/src/OutputCapturer.cpp b/JGE/src/OutputCapturer.cpp
index 3c31da724..41dc4fb81 100644
--- a/JGE/src/OutputCapturer.cpp
+++ b/JGE/src/OutputCapturer.cpp
@@ -1,3 +1,4 @@
 #include "../include/OutputCapturer.h"
 
 std::ostringstream OutputCapturer::stream;
+boost::mutex mMutex;