Merge branch 'main' into sb/zen-helpsb/zen-help

- Combine HelpCommand (this branch) with HistoryCommand (main) in zen CLI dispatcher
- Keep filter-aware TuiPickOne rewrite; adopt main's ASCII arrow glyphs in doc comment

1 files changed, 11 insertions, 11 deletions

diff --git a/src/zenserver/storage/upstream/upstreamcache.cpp b/src/zenserver/storage/upstream/upstreamcache.cpp
index b26c57414..a516c452c 100644
--- a/src/zenserver/storage/upstream/upstreamcache.cpp
+++ b/src/zenserver/storage/upstream/upstreamcache.cpp
@@ -772,7 +772,7 @@ namespace detail {
 		UpstreamEndpointInfo  m_Info;
 		UpstreamStatus		  m_Status;
 		UpstreamEndpointStats m_Stats;
-		RefPtr<JupiterClient> m_Client;
+		Ref<JupiterClient>	  m_Client;
 		const bool			  m_AllowRedirect = false;
 	};
 
@@ -1446,7 +1446,7 @@ namespace detail {
 			// Make sure we safely bump the refcount inside a scope lock
 			RwLock::SharedLockScope _(m_ClientLock);
 			ZEN_ASSERT(m_Client);
-			Ref<ZenStructuredCacheClient> ClientRef(m_Client);
+			Ref<ZenStructuredCacheClient> ClientRef(m_Client.Get());
 			_.ReleaseNow();
 			return ClientRef;
 		}
@@ -1485,15 +1485,15 @@ namespace detail {
 
 		LoggerRef Log() { return m_Log; }
 
-		LoggerRef						 m_Log;
-		UpstreamEndpointInfo			 m_Info;
-		UpstreamStatus					 m_Status;
-		UpstreamEndpointStats			 m_Stats;
-		std::vector<ZenEndpoint>		 m_Endpoints;
-		std::chrono::milliseconds		 m_ConnectTimeout;
-		std::chrono::milliseconds		 m_Timeout;
-		RwLock							 m_ClientLock;
-		RefPtr<ZenStructuredCacheClient> m_Client;
+		LoggerRef					  m_Log;
+		UpstreamEndpointInfo		  m_Info;
+		UpstreamStatus				  m_Status;
+		UpstreamEndpointStats		  m_Stats;
+		std::vector<ZenEndpoint>	  m_Endpoints;
+		std::chrono::milliseconds	  m_ConnectTimeout;
+		std::chrono::milliseconds	  m_Timeout;
+		RwLock						  m_ClientLock;
+		Ref<ZenStructuredCacheClient> m_Client;
 	};
 
 }  // namespace detail