Allow shutting down the active remote server

baldurk · Sep 13, 2016 · c10c487 · c10c487
1 parent c1a0b48
commit c10c487
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 7 deletions.
diff --git a/renderdocui/Code/RenderManager.cs b/renderdocui/Code/RenderManager.cs
@@ -370,8 +370,19 @@ public void DisconnectFromRemoteServer()
             m_Remote = null;
         }
 
+        public void ShutdownServer()
+        {
+            if(m_Remote != null)
+                m_Remote.ShutdownServerAndConnection();
+
+            m_Remote = null;
+        }
+
         public void PingRemote()
         {
+            if (m_Remote == null)
+                return;
+
             if (Monitor.TryEnter(m_Remote))
             {
                 try

diff --git a/renderdocui/Windows/Dialogs/RemoteManager.Designer.cs b/renderdocui/Windows/Dialogs/RemoteManager.Designer.cs
diff --git a/renderdocui/Windows/Dialogs/RemoteManager.cs b/renderdocui/Windows/Dialogs/RemoteManager.cs
@@ -371,7 +371,7 @@ private void updateConnectButton()
                     {
                         connect.Text = "Shutdown";
 
-                        if (host.Busy || host.Connected)
+                        if (host.Busy && !host.Connected)
                             connect.Enabled = false;
                     }
                     else
@@ -476,11 +476,19 @@ private void connect_Click(object sender, EventArgs e)
                     // shut down
                     try
                     {
-                        RemoteServer server = StaticExports.CreateRemoteServer(host.Hostname, 0);
-                        server.ShutdownServerAndConnection();
-                        hosts.BeginUpdate();
-                        SetRemoteServerLive(node, false, false);
-                        hosts.EndUpdate();
+                        if (host.Connected)
+                        {
+                            m_Core.Renderer.ShutdownServer();
+                            SetRemoteServerLive(node, false, false);
+                        }
+                        else
+                        {
+                            RemoteServer server = StaticExports.CreateRemoteServer(host.Hostname, 0);
+                            server.ShutdownServerAndConnection();
+                            hosts.BeginUpdate();
+                            SetRemoteServerLive(node, false, false);
+                            hosts.EndUpdate();
+                        }
                     }
                     catch (Exception)
                     {