Fix Race conditions on Page.CloseAsync (#833)

hardkoded · Jan 4, 2019 · 3c093e4 · 3c093e4
1 parent b9688e0
commit 3c093e4
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/PuppeteerSharp/Page.cs b/lib/PuppeteerSharp/Page.cs
@@ -46,6 +46,7 @@ public class Page : IDisposable
         private PageGetLayoutMetricsResponse _burstModeMetrics;
         private bool _screenshotBurstModeOn;
         private ScreenshotOptions _screenshotBurstModeOptions;
+        private TaskCompletionSource<bool> _closeCompletedTcs = new TaskCompletionSource<bool>();
 
         private static readonly Dictionary<string, decimal> _unitToPixels = new Dictionary<string, decimal> {
             {"px", 1},
@@ -80,6 +81,7 @@ public class Page : IDisposable
             {
                 Close?.Invoke(this, EventArgs.Empty);
                 IsClosed = true;
+                _closeCompletedTcs.TrySetResult(true);
             });
 
             Client.MessageReceived += Client_MessageReceived;
@@ -1057,7 +1059,7 @@ public Task CloseAsync(PageCloseOptions options = null)
             }
 
             _logger.LogWarning("Protocol error: Connection closed. Most likely the page has been closed.");
-            return Target.CloseTask;
+            return _closeCompletedTcs.Task;
         }
 
         /// <summary>