Merge branch 'Patron' of https://github.com/TorchAPI/Torch into survival

2019-02-25 15:27:34 -05:00
parent 4dee127ce8 3e341e02c8
commit 8dc542a31c
39 changed files with 2012 additions and 337 deletions
--- a/Torch.Server/Initializer.cs
+++ b/Torch.Server/Initializer.cs
@@ -111,8 +111,15 @@ quit";
                    init.ContinueWith(x => _server.Start());

                Log.Info("Showing UI");
-                Console.SetOut(TextWriter.Null);
-                NativeMethods.FreeConsole();
+
+#if !DEBUG
+                if (!_config.IndependentConsole)
+                {
+                    Console.SetOut(TextWriter.Null);
+                    NativeMethods.FreeConsole();
+                }
+#endif
+
                new TorchUI(_server).ShowDialog();
            }
            else