lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-06 10:00:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix android deadlock on shutdown

Browse Source
This commit is contained in:
baldurk
2020-01-30 14:34:54 +00:00
parent a8071679bd
commit 385121d2ca
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/android/android.cpp
+8 -4
View File
@@ -669,12 +669,14 @@ struct AndroidController : public IDeviceProtocolHandler
{
void Start()
{
SCOPED_LOCK(lock);
if(running == 0)
{
Atomic::Inc32(&running);
Android::initAdb();
{
SCOPED_LOCK(lock);
Android::initAdb();
}
thread = Threading::CreateThread([]() { m_Inst.ThreadEntry(); });
RenderDoc::Inst().RegisterShutdownFunction([]() { m_Inst.Shutdown(); });
@@ -683,13 +685,15 @@ struct AndroidController : public IDeviceProtocolHandler
void Shutdown()
{
SCOPED_LOCK(lock);
Atomic::Dec32(&running);
Threading::JoinThread(thread);
Threading::CloseThread(thread);
thread = 0;
Android::shutdownAdb();
{
SCOPED_LOCK(lock);
Android::shutdownAdb();
}
}
struct Command