From 74bbe5988be95156f50b86d9e71bd604b845f25e Mon Sep 17 00:00:00 2001
From: Alexey Shekhirin <github@shekhirin.com>
Date: Thu, 18 Jun 2026 09:41:35 +0100
Subject: [PATCH] Use consistent thread order in more thread pickers

---
 profiler/src/profiler/TracyView_ContextSwitch.cpp | 2 ++
 profiler/src/profiler/TracyView_Messages.cpp      | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/profiler/src/profiler/TracyView_ContextSwitch.cpp b/profiler/src/profiler/TracyView_ContextSwitch.cpp
index 5bde733c..41a49d13 100644
--- a/profiler/src/profiler/TracyView_ContextSwitch.cpp
+++ b/profiler/src/profiler/TracyView_ContextSwitch.cpp
@@ -389,6 +389,8 @@ void View::DrawContextSwitchList( const TimelineContext& ctx, const std::vector<
 
 void View::DrawWaitStacks()
 {
+    UpdateThreadOrder();
+
     const auto scale = GetScale();
     ImGui::SetNextWindowSize( ImVec2( 1400 * scale, 500 * scale ), ImGuiCond_FirstUseEver );
     ImGui::Begin( "Wait stacks", &m_showWaitStacks );
diff --git a/profiler/src/profiler/TracyView_Messages.cpp b/profiler/src/profiler/TracyView_Messages.cpp
index 1e4857b6..09ffdd0d 100644
--- a/profiler/src/profiler/TracyView_Messages.cpp
+++ b/profiler/src/profiler/TracyView_Messages.cpp
@@ -137,6 +137,8 @@ void View::DrawMessages()
         ImGui::Checkbox( ICON_FA_IMAGE " Show frame images", &m_showMessageImages );
     }
 
+    UpdateThreadOrder();
+
     bool threadsChanged = false;
     ImGui::AlignTextToFramePadding();
     auto expand = ImGui::TreeNodeEx( ICON_FA_SHUFFLE " Visible threads:", ImGuiTreeNodeFlags_SpanLabelWidth );