From f0d524ad1fff8dbe78cfbfdbe7b32392a27fc3dc Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Sat, 20 Nov 2021 14:44:22 +0100 Subject: [PATCH] Don't pass font to SourceView ctor. --- server/TracySourceView.cpp | 4 ++-- server/TracySourceView.hpp | 2 +- server/TracyView.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/TracySourceView.cpp b/server/TracySourceView.cpp index e3087a34..c8b2373f 100644 --- a/server/TracySourceView.cpp +++ b/server/TracySourceView.cpp @@ -161,8 +161,8 @@ static void PrintHwSampleTooltip( size_t cycles, size_t retired, size_t cacheRef enum { JumpSeparation = 6 }; enum { JumpArrowBase = 9 }; -SourceView::SourceView( ImFont* font, GetWindowCallback gwcb ) - : m_font( font ) +SourceView::SourceView( GetWindowCallback gwcb ) + : m_font( nullptr ) , m_symAddr( 0 ) , m_targetAddr( 0 ) , m_targetLine( 0 ) diff --git a/server/TracySourceView.hpp b/server/TracySourceView.hpp index 13449ef3..2cb78a4c 100644 --- a/server/TracySourceView.hpp +++ b/server/TracySourceView.hpp @@ -142,7 +142,7 @@ private: public: using GetWindowCallback = void*(*)(); - SourceView( ImFont* font, GetWindowCallback gwcb ); + SourceView( GetWindowCallback gwcb ); void UpdateFont( ImFont* font ) { m_font = font; } void SetCpuId( uint32_t cpuid ); diff --git a/server/TracyView.cpp b/server/TracyView.cpp index 265bed7f..000f5d99 100644 --- a/server/TracyView.cpp +++ b/server/TracyView.cpp @@ -234,7 +234,7 @@ void View::InitMemory() void View::InitTextEditor( ImFont* font ) { - m_sourceView = std::make_unique( font, m_gwcb ); + m_sourceView = std::make_unique( m_gwcb ); m_sourceViewFile = nullptr; }