From 1ad4380fab31d27f96ee34c9b111a3f91c123834 Mon Sep 17 00:00:00 2001
From: Peter Tissen <dravorek@gmail.com>
Date: Fri, 27 Jun 2014 06:01:40 +0200
Subject: [PATCH] rename conlog gui file and set the logbuffer-consumed flag
 sooner

---
 rpcs3/Gui/{ConLog.cpp => ConLogFrame.cpp} | 4 ++--
 rpcs3/rpcs3.vcxproj                       | 2 +-
 rpcs3/rpcs3.vcxproj.filters               | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename rpcs3/Gui/{ConLog.cpp => ConLogFrame.cpp} (98%)

diff --git a/rpcs3/Gui/ConLog.cpp b/rpcs3/Gui/ConLogFrame.cpp
similarity index 98%
rename from rpcs3/Gui/ConLog.cpp
rename to rpcs3/Gui/ConLogFrame.cpp
index e62927bef6..273d673a02 100644
--- a/rpcs3/Gui/ConLog.cpp
+++ b/rpcs3/Gui/ConLogFrame.cpp
@@ -59,6 +59,7 @@ struct wxWriter : Log::LogListener
 			std::vector<char> local_messages(size);
 			messages.popN(&local_messages.front(), size);
 			messages.unlockGet();
+			newLog = false;
 
 			u32 cursor = 0;
 			u32 removed = 0;
@@ -95,7 +96,6 @@ struct wxWriter : Log::LogListener
 				m_log->Remove(0, m_log->GetLastPosition() - (GUI_BUFFER_MAX_SIZE/2));
 			}
 		}
-		newLog = false;
 	}
 
 	//put message into the log buffer
@@ -114,7 +114,7 @@ struct wxWriter : Log::LogListener
 		std::vector<char> temp_buffer(size);
 		msg.serialize(temp_buffer.data());
 		messages.pushRange(temp_buffer.begin(), temp_buffer.end());
-		if (!newLog.load(std::memory_order_relaxed))
+		if (!newLog.load())
 		{
 			newLog = true;
 			m_log->GetEventHandler()->QueueEvent(new wxCommandEvent(EVT_LOG_COMMAND));
diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj
index 3ccc472ea0..a791fc8435 100644
--- a/rpcs3/rpcs3.vcxproj
+++ b/rpcs3/rpcs3.vcxproj
@@ -164,7 +164,7 @@
     <ClCompile Include="..\Utilities\Thread.cpp" />
     <ClCompile Include="Emu\DbgCommand.cpp" />
     <ClCompile Include="Gui\CompilerELF.cpp" />
-    <ClCompile Include="Gui\ConLog.cpp" />
+    <ClCompile Include="Gui\ConLogFrame.cpp" />
     <ClCompile Include="Gui\Debugger.cpp" />
     <ClCompile Include="Gui\DisAsmFrame.cpp" />
     <ClCompile Include="Gui\GameViewer.cpp" />
diff --git a/rpcs3/rpcs3.vcxproj.filters b/rpcs3/rpcs3.vcxproj.filters
index 97c4e34c61..15476df48d 100644
--- a/rpcs3/rpcs3.vcxproj.filters
+++ b/rpcs3/rpcs3.vcxproj.filters
@@ -24,9 +24,6 @@
     <ClCompile Include="Gui\MainFrame.cpp">
       <Filter>Gui</Filter>
     </ClCompile>
-    <ClCompile Include="Gui\ConLog.cpp">
-      <Filter>Gui</Filter>
-    </ClCompile>
     <ClCompile Include="Gui\MemoryViewer.cpp">
       <Filter>Gui</Filter>
     </ClCompile>
@@ -102,6 +99,9 @@
     <ClCompile Include="Emu\DbgCommand.cpp">
       <Filter>Emu</Filter>
     </ClCompile>
+    <ClCompile Include="Gui\ConLogFrame.cpp">
+      <Filter>Gui</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="rpcs3.rc" />