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 e62927bef680..273d673a0222 100644 --- a/rpcs3/Gui/ConLog.cpp +++ b/rpcs3/Gui/ConLogFrame.cpp @@ -59,6 +59,7 @@ struct wxWriter : Log::LogListener std::vector 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 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 3ccc472ea056..a791fc8435f3 100644 --- a/rpcs3/rpcs3.vcxproj +++ b/rpcs3/rpcs3.vcxproj @@ -164,7 +164,7 @@ - + diff --git a/rpcs3/rpcs3.vcxproj.filters b/rpcs3/rpcs3.vcxproj.filters index 97c4e34c61fc..15476df48d75 100644 --- a/rpcs3/rpcs3.vcxproj.filters +++ b/rpcs3/rpcs3.vcxproj.filters @@ -24,9 +24,6 @@ Gui - - Gui - Gui @@ -102,6 +99,9 @@ Emu + + Gui +