ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename conlog gui file and set the logbuffer-consumed flag sooner

This commit is contained in:
Peter Tissen 2014-06-27 06:01:40 +02:00
parent 21da317453
commit 1ad4380fab
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rpcs3/Gui/ConLog.cpp → rpcs3/Gui/ConLogFrame.cpp
View File

@ -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));

2
rpcs3/rpcs3.vcxproj
View File

@ -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" />

6
rpcs3/rpcs3.vcxproj.filters
View File

@ -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" />