From f9a2722243a1106005a52428ab14c1fd6d790a27 Mon Sep 17 00:00:00 2001
From: Bud Cribar <budcribar@msn.com>
Date: Sat, 24 Feb 2024 12:22:34 -0700
Subject: [PATCH] Remove Wait for windows handle on Restart

---
 Directory.Build.props                            |  2 +-
 src/RemoteWebView/RemoteWebView.cs               | 16 +---------------
 .../NUnitTestProject/TestRemoteBlazorWpf.cs      |  2 +-
 .../TestRemoteEmbeddedBlazorWebView.cs           |  1 -
 .../NUnitTestProject/WebdriverTestProject.csproj |  1 -
 5 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index c536c1e7..a109c717 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -2,6 +2,6 @@
 <Project>
   <PropertyGroup>
     <PackageOutputPath>$(MSBuildThisFileDirectory)artifacts</PackageOutputPath>
-    <VersionPrefix>8.0.2</VersionPrefix>
+    <VersionPrefix>8.0.3</VersionPrefix>
   </PropertyGroup>
 </Project>
diff --git a/src/RemoteWebView/RemoteWebView.cs b/src/RemoteWebView/RemoteWebView.cs
index aebb6254..b152a616 100644
--- a/src/RemoteWebView/RemoteWebView.cs
+++ b/src/RemoteWebView/RemoteWebView.cs
@@ -63,20 +63,6 @@ public static void Restart(IBlazorWebView blazorWebView)
                 StartInfo = psi
             };
             p.Start();
-
-            int i = 0;
-            // Try to prevent COMException 0x8007139F
-            while (p.MainWindowHandle == IntPtr.Zero)
-            {
-                // Refresh process property values
-                p.Refresh();
-
-                // Wait a bit before checking again
-                Thread.Sleep(100);
-                i++;
-                if (i >= 100)
-                    break;
-            }
         }
 
         private ILogger Logger { get; set; }
@@ -147,7 +133,7 @@ public static void Restart(IBlazorWebView blazorWebView)
         protected WebViewIPC.WebViewIPCClient? Client()
         {
             if (BlazorWebView.ServerUri == null) return null;
-
+            if (BlazorWebView.GrpcBaseUri == null) return null;
             PingIntervalSeconds = BlazorWebView.PingIntervalSeconds;
 
             if (client == null)
diff --git a/testassets/NUnitTestProject/TestRemoteBlazorWpf.cs b/testassets/NUnitTestProject/TestRemoteBlazorWpf.cs
index 75c6f5fb..33ddc0fb 100644
--- a/testassets/NUnitTestProject/TestRemoteBlazorWpf.cs
+++ b/testassets/NUnitTestProject/TestRemoteBlazorWpf.cs
@@ -29,7 +29,7 @@ public class TestRemoteBlazorWpf
         protected static string[] ids = Array.Empty<string>();
         protected static Process? process;
         protected static List<Process> clients = new();
-        protected static int NUM_LOOPS_WAITING_FOR_PAGE_LOAD = 100;
+        protected static int NUM_LOOPS_WAITING_FOR_PAGE_LOAD = 200;
 
         public virtual Process CreateClient()
         {
diff --git a/testassets/NUnitTestProject/TestRemoteEmbeddedBlazorWebView.cs b/testassets/NUnitTestProject/TestRemoteEmbeddedBlazorWebView.cs
index cf9936d3..ce60d950 100644
--- a/testassets/NUnitTestProject/TestRemoteEmbeddedBlazorWebView.cs
+++ b/testassets/NUnitTestProject/TestRemoteEmbeddedBlazorWebView.cs
@@ -3,7 +3,6 @@
 
 namespace WebdriverTestProject
 {
-    [Ignore]
     [TestClass]
     public class TestRemoteEmbeddedBlazorWebView : TestRemoteBlazorWpf
     {
diff --git a/testassets/NUnitTestProject/WebdriverTestProject.csproj b/testassets/NUnitTestProject/WebdriverTestProject.csproj
index 6b7a80c8..379fc1f0 100644
--- a/testassets/NUnitTestProject/WebdriverTestProject.csproj
+++ b/testassets/NUnitTestProject/WebdriverTestProject.csproj
@@ -32,7 +32,6 @@
 		
 	</ItemGroup>
   <ItemGroup>
-    <Compile Remove="TestRemoteEmbeddedBlazorWebView.cs" />
     <Compile Remove="TestRemotePackageBlazorForm.cs" />
   </ItemGroup>