Ensure we tidy up progress ticker and callback even if replay fails

This commit is contained in:
baldurk
2018-01-22 19:38:44 +00:00
parent 92808efc93
commit 91dbfc4cc6
+9 -8
View File
@@ -452,16 +452,17 @@ static void ActiveRemoteClientThread(ClientThread *threadData,
remoteDriver->Shutdown();
remoteDriver = NULL;
}
else
{
RenderDoc::Inst().SetProgressCallback<LoadProgress>(RENDERDOC_ProgressCallback());
}
kill = true;
Threading::JoinThread(ticker);
Threading::CloseThread(ticker);
RenderDoc::Inst().SetProgressCallback<LoadProgress>(RENDERDOC_ProgressCallback());
proxy = new ReplayProxy(reader, writer, remoteDriver, replayDriver, previewWindow);
}
kill = true;
Threading::JoinThread(ticker);
Threading::CloseThread(ticker);
if(status == ReplayStatus::Succeeded && remoteDriver)
{
proxy = new ReplayProxy(reader, writer, remoteDriver, replayDriver, previewWindow);
}
}
else