Close CefSharp.BrowserSubprocess.exe if parent process exits (#2375)

* Close cefsharp subprocess if main process dies * Code review * Await before exiting * Update Program.cs
cefsharp · Jun 20, 2018 · 4f9c95c · 4f9c95c
1 parent a9a8cb8
commit 4f9c95c
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/CefSharp.BrowserSubprocess.Core/WcfEnabledSubProcess.h b/CefSharp.BrowserSubprocess.Core/WcfEnabledSubProcess.h
@@ -1,4 +1,4 @@
-// Copyright © 2010-2017 The CefSharp Authors. All rights reserved.
+// Copyright © 2010-2017 The CefSharp Authors. All rights reserved.
 //
 // Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
 

diff --git a/CefSharp.BrowserSubprocess/Program.cs b/CefSharp.BrowserSubprocess/Program.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Diagnostics;
+using System.Threading.Tasks;
 using CefSharp.Internals;
 
 namespace CefSharp.BrowserSubprocess
@@ -19,6 +20,7 @@ public static int Main(string[] args)
             int result;
             var type = args.GetArgumentValue(CefSharpArguments.SubProcessTypeArgument);
             var parentProcessId = int.Parse(args.GetArgumentValue(CefSharpArguments.HostProcessIdArgument));
+            Task.Factory.StartNew(() => AwaitParentProcessExit(parentProcessId), TaskCreationOptions.LongRunning);
 
             //Use our custom subProcess provides features like EvaluateJavascript
             if (type == "renderer")
@@ -37,8 +39,28 @@ public static int Main(string[] args)
             }
 
             Debug.WriteLine("BrowserSubprocess shutting down.");
-
+            
             return result;
         }
+
+        private static async void AwaitParentProcessExit(int parentProcessId) 
+        {
+            try 
+            {
+                var parentProcess = Process.GetProcessById(parentProcessId);
+                parentProcess.WaitForExit();
+            }
+            catch (Exception e) 
+            {
+                //main process probably died already
+                Debug.WriteLine(e);
+            }
+
+            await Task.Delay(1000); //wait a bit before exiting
+
+            Debug.WriteLine("BrowserSubprocess shutting down forcibly.");
+
+            Environment.Exit(0);
+        }
     }
 }
diff --git a/CefSharp/CefCustomScheme.cs b/CefSharp/CefCustomScheme.cs
@@ -119,13 +119,12 @@ public CefCustomScheme()
         /// <returns>list of scheme objects</returns>
         public static List<CefCustomScheme> ParseCommandLineArguments(IEnumerable<string> args)
         {
-            var schemes = args.FirstOrDefault(a => a.StartsWith(CefSharpArguments.CustomSchemeArgument));
+            var schemes = args.GetArgumentValue(CefSharpArguments.CustomSchemeArgument);
             var customSchemes = new List<CefCustomScheme>();
 
             if (!string.IsNullOrEmpty(schemes))
             {
-                //Remove the "--custom-scheme=" part of the argument
-                schemes.Substring(CefSharpArguments.CustomSchemeArgument.Length + 1).Split(';').ToList().ForEach(x =>
+                schemes.Split(';').ToList().ForEach(x =>
                 {
                     var tokens = x.Split('|');
                     var customScheme = new CefCustomScheme