From 569a9fb9bef0b8c999b15b24a8f4c59247510599 Mon Sep 17 00:00:00 2001
From: Bartosz Taudul <wolf.pld@gmail.com>
Date: Sat, 16 Feb 2019 22:26:50 +0100
Subject: [PATCH] Change order of file version checks during loading memory
 events.

---
 server/TracyWorker.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp
index 30a13841..ac2806bb 100644
--- a/server/TracyWorker.cpp
+++ b/server/TracyWorker.cpp
@@ -878,17 +878,7 @@ Worker::Worker( FileRead& f, EventType::Type eventMask )
         for( uint64_t i=0; i<sz; i++ )
         {
             s_loadProgress.subProgress.store( i, std::memory_order_relaxed );
-            if( fileVer <= FileVersion( 0, 3, 1 ) )
-            {
-                f.Read( mem, sizeof( MemEvent::ptr ) + sizeof( MemEvent::size ) + sizeof( MemEvent::timeAlloc ) + sizeof( MemEvent::timeFree ) );
-                mem->csAlloc = 0;
-                mem->csFree = 0;
-            }
-            else if( fileVer <= FileVersion( 0, 4, 1 ) )
-            {
-                f.Read( mem, sizeof( MemEvent::ptr ) + sizeof( MemEvent::size ) + sizeof( MemEvent::timeAlloc ) + sizeof( MemEvent::timeFree ) + sizeof( MemEvent::csAlloc ) + sizeof( MemEvent::csFree ) );
-            }
-            else
+            if( fileVer > FileVersion( 0, 4, 1 ) )
             {
                 f.Read2( mem->ptr, mem->size );
                 mem->timeAlloc = ReadTimeOffset( f, refTime );
@@ -904,6 +894,16 @@ Worker::Worker( FileRead& f, EventType::Type eventMask )
                 }
                 f.Read2( mem->csAlloc, mem->csFree );
             }
+            else if( fileVer > FileVersion( 0, 3, 1 ) )
+            {
+                f.Read( mem, sizeof( MemEvent::ptr ) + sizeof( MemEvent::size ) + sizeof( MemEvent::timeAlloc ) + sizeof( MemEvent::timeFree ) + sizeof( MemEvent::csAlloc ) + sizeof( MemEvent::csFree ) );
+            }
+            else
+            {
+                f.Read( mem, sizeof( MemEvent::ptr ) + sizeof( MemEvent::size ) + sizeof( MemEvent::timeAlloc ) + sizeof( MemEvent::timeFree ) );
+                mem->csAlloc = 0;
+                mem->csFree = 0;
+            }
 
             uint64_t t0, t1;
             f.Read2( t0, t1 );