diff --git a/server/TracyEvent.hpp b/server/TracyEvent.hpp index 4fa4b1d8..8f2b1f49 100644 --- a/server/TracyEvent.hpp +++ b/server/TracyEvent.hpp @@ -262,7 +262,7 @@ struct PlotItem double val; }; -enum class PlotType +enum class PlotType : uint8_t { User, Memory, diff --git a/server/TracyVersion.hpp b/server/TracyVersion.hpp index 6e433754..2517e8be 100644 --- a/server/TracyVersion.hpp +++ b/server/TracyVersion.hpp @@ -7,7 +7,7 @@ namespace Version { enum { Major = 0 }; enum { Minor = 4 }; -enum { Patch = 4 }; +enum { Patch = 5 }; } } diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp index f5633473..f287f560 100644 --- a/server/TracyWorker.cpp +++ b/server/TracyWorker.cpp @@ -826,7 +826,14 @@ Worker::Worker( FileRead& f, EventType::Type eventMask ) { s_loadProgress.subProgress.store( i, std::memory_order_relaxed ); auto pd = m_slab.AllocInit(); - pd->type = PlotType::User; + if( fileVer >= FileVersion( 0, 4, 5 ) ) + { + f.Read( pd->type ); + } + else + { + pd->type = PlotType::User; + } f.Read( pd->name ); f.Read( pd->min ); f.Read( pd->max ); @@ -3720,11 +3727,12 @@ void Worker::Write( FileWrite& f ) } sz = m_data.plots.Data().size(); - for( auto& plot : m_data.plots.Data() ) { if( plot->type != PlotType::User ) sz--; } + for( auto& plot : m_data.plots.Data() ) { if( plot->type == PlotType::Memory ) sz--; } f.Write( &sz, sizeof( sz ) ); for( auto& plot : m_data.plots.Data() ) { - if( plot->type != PlotType::User ) continue; + if( plot->type == PlotType::Memory ) continue; + f.Write( &plot->type, sizeof( plot->type ) ); f.Write( &plot->name, sizeof( plot->name ) ); f.Write( &plot->min, sizeof( plot->min ) ); f.Write( &plot->max, sizeof( plot->max ) );