From cb298893e7f0a61697a36ec679d7362c039e2bda Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Sat, 21 Apr 2018 16:02:36 +0200 Subject: [PATCH] Fix skipping lock data. --- server/TracyWorker.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp index 0e2ee518..2143d974 100644 --- a/server/TracyWorker.cpp +++ b/server/TracyWorker.cpp @@ -400,7 +400,14 @@ Worker::Worker( FileRead& f, EventType::Type eventMask ) f.Read( &tsz, sizeof( tsz ) ); f.Skip( tsz * sizeof( uint64_t ) ); f.Read( &tsz, sizeof( tsz ) ); - f.Skip( tsz * ( type == LockType::Lockable ? sizeof( LockEvent ) : sizeof( LockEventShared ) ) ); + if( fileVer >= FileVersion( 0, 3, 0 ) ) + { + f.Skip( sizeof( LockEvent::time ) + sizeof( LockEvent::type ) + sizeof( LockEvent::srcloc ) + sizeof( LockEvent::thread ) ); + } + else + { + f.Skip( tsz * ( type == LockType::Lockable ? sizeof( LockEvent ) : sizeof( LockEventShared ) ) ); + } } }