From 5d976b6e18f98b7083309df5e80b8eb49a106a38 Mon Sep 17 00:00:00 2001
From: Austin Shalit <austinshalit@gmail.com>
Date: Mon, 28 Dec 2020 15:29:25 -0800
Subject: [PATCH] [glass] Load NetworkTableView settings on first draw (#2993)

Before this change, user settings were not loaded until after the first time they opened the settings context menu.
---
 glass/src/libnt/native/cpp/NetworkTables.cpp | 34 ++++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/glass/src/libnt/native/cpp/NetworkTables.cpp b/glass/src/libnt/native/cpp/NetworkTables.cpp
index 3d434198ae..70129380ec 100644
--- a/glass/src/libnt/native/cpp/NetworkTables.cpp
+++ b/glass/src/libnt/native/cpp/NetworkTables.cpp
@@ -643,31 +643,31 @@ void glass::DisplayNetworkTables(NetworkTablesModel* model,
 }
 
 void NetworkTablesView::Display() {
-  if (ImGui::BeginPopupContextItem()) {
-    auto& storage = GetStorage();
-    auto pTreeView = storage.GetBoolRef(
-        "tree", m_defaultFlags & NetworkTablesFlags_TreeView);
-    auto pShowConnections = storage.GetBoolRef(
-        "connections", m_defaultFlags & NetworkTablesFlags_ShowConnections);
-    auto pShowFlags = storage.GetBoolRef(
-        "flags", m_defaultFlags & NetworkTablesFlags_ShowFlags);
-    auto pShowTimestamp = storage.GetBoolRef(
-        "timestamp", m_defaultFlags & NetworkTablesFlags_ShowTimestamp);
+  auto& storage = GetStorage();
+  auto pTreeView =
+      storage.GetBoolRef("tree", m_defaultFlags & NetworkTablesFlags_TreeView);
+  auto pShowConnections = storage.GetBoolRef(
+      "connections", m_defaultFlags & NetworkTablesFlags_ShowConnections);
+  auto pShowFlags = storage.GetBoolRef(
+      "flags", m_defaultFlags & NetworkTablesFlags_ShowFlags);
+  auto pShowTimestamp = storage.GetBoolRef(
+      "timestamp", m_defaultFlags & NetworkTablesFlags_ShowTimestamp);
 
+  if (ImGui::BeginPopupContextItem()) {
     ImGui::MenuItem("Tree View", "", pTreeView);
     ImGui::MenuItem("Show Connections", "", pShowConnections);
     ImGui::MenuItem("Show Flags", "", pShowFlags);
     ImGui::MenuItem("Show Timestamp", "", pShowTimestamp);
 
-    m_flags &=
-        ~(NetworkTablesFlags_TreeView | NetworkTablesFlags_ShowConnections |
-          NetworkTablesFlags_ShowFlags | NetworkTablesFlags_ShowTimestamp);
-    m_flags |= (*pTreeView ? NetworkTablesFlags_TreeView : 0) |
-               (*pShowConnections ? NetworkTablesFlags_ShowConnections : 0) |
-               (*pShowFlags ? NetworkTablesFlags_ShowFlags : 0) |
-               (*pShowTimestamp ? NetworkTablesFlags_ShowTimestamp : 0);
     ImGui::EndPopup();
   }
 
+  m_flags &=
+      ~(NetworkTablesFlags_TreeView | NetworkTablesFlags_ShowConnections |
+        NetworkTablesFlags_ShowFlags | NetworkTablesFlags_ShowTimestamp);
+  m_flags |= (*pTreeView ? NetworkTablesFlags_TreeView : 0) |
+             (*pShowConnections ? NetworkTablesFlags_ShowConnections : 0) |
+             (*pShowFlags ? NetworkTablesFlags_ShowFlags : 0) |
+             (*pShowTimestamp ? NetworkTablesFlags_ShowTimestamp : 0);
   DisplayNetworkTables(m_model, m_flags);
 }