mirror of
https://github.com/wolfpld/tracy.git
synced 2024-11-23 06:44:35 +00:00
Load second trace user data in compare menu.
This commit is contained in:
parent
e5d5af84fd
commit
be3b458f28
@ -7160,6 +7160,7 @@ void View::DrawCompare()
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
m_compare.second = std::make_unique<Worker>( *f, EventType::None );
|
m_compare.second = std::make_unique<Worker>( *f, EventType::None );
|
||||||
|
m_compare.userData = std::make_unique<UserData>( m_compare.second->GetCaptureProgram().c_str(), m_compare.second->GetCaptureTime() );
|
||||||
}
|
}
|
||||||
catch( const tracy::UnsupportedVersion& e )
|
catch( const tracy::UnsupportedVersion& e )
|
||||||
{
|
{
|
||||||
@ -7213,6 +7214,7 @@ void View::DrawCompare()
|
|||||||
{
|
{
|
||||||
m_compare.Reset();
|
m_compare.Reset();
|
||||||
m_compare.second.reset();
|
m_compare.second.reset();
|
||||||
|
m_compare.userData.reset();
|
||||||
ImGui::End();
|
ImGui::End();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -455,6 +455,7 @@ private:
|
|||||||
bool ignoreCase = false;
|
bool ignoreCase = false;
|
||||||
bool link = true;
|
bool link = true;
|
||||||
std::unique_ptr<Worker> second;
|
std::unique_ptr<Worker> second;
|
||||||
|
std::unique_ptr<UserData> userData;
|
||||||
std::thread loadThread;
|
std::thread loadThread;
|
||||||
int badVer = 0;
|
int badVer = 0;
|
||||||
char pattern[1024] = {};
|
char pattern[1024] = {};
|
||||||
|
Loading…
Reference in New Issue
Block a user