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

Merge pull request #3006 from phire/deadlock 

Fix deadlock with KHR_debug.
This commit is contained in:
Scott Mansell 2015-09-12 16:19:58 +12:00
parent ee7285a1db b9b80191d5
commit 02842cb34b
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Source/Core/DolphinWX/LogWindow.cpp
View File

@ -279,10 +279,24 @@ void CLogWindow::UpdateLog()
m_LogTimer.Stop(); m_LogTimer.Stop();
std::lock_guard<std::mutex> lk(m_LogSection); while (true)
while (!msgQueue.empty())
{ {
switch (msgQueue.front().first) u8 log_level;
wxString log_msg;
// We can't hold this mutex while calling Wx functions, due to deadlocks
{
std::lock_guard<std::mutex> lk(m_LogSection);
if (msgQueue.empty())
break;
log_level = msgQueue.front().first;
log_msg = std::move(msgQueue.front().second);
msgQueue.pop();
}
switch (log_level)
{ {
case LogTypes::LOG_LEVELS::LERROR: case LogTypes::LOG_LEVELS::LERROR:
m_Log->SetDefaultStyle(wxTextAttr(*wxRED)); m_Log->SetDefaultStyle(wxTextAttr(*wxRED));
@ -309,15 +323,13 @@ void CLogWindow::UpdateLog()
break; break;
} }
if (msgQueue.front().second.size()) if (log_msg.size())
{ {
int i = m_Log->GetLastPosition(); int i = m_Log->GetLastPosition();
m_Log->AppendText(msgQueue.front().second); m_Log->AppendText(log_msg);
// White timestamp // White timestamp
m_Log->SetStyle(i, i + 9, wxTextAttr(*wxWHITE)); m_Log->SetStyle(i, i + 9, wxTextAttr(*wxWHITE));
} }
msgQueue.pop();
} }
m_LogTimer.Start(); m_LogTimer.Start();