From 88a55c879550dec6768a6a5ce7576c894675d359 Mon Sep 17 00:00:00 2001 From: chylex <contact@chylex.com> Date: Thu, 9 Mar 2023 20:27:57 +0100 Subject: [PATCH] Work around NullReferenceException when browser frame load events have a null URL Closes #354 --- .../TweetImpl.CefSharp/Component/BrowserComponentBase.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/windows/TweetImpl.CefSharp/Component/BrowserComponentBase.cs b/windows/TweetImpl.CefSharp/Component/BrowserComponentBase.cs index b0e8ed20..dcf97d25 100644 --- a/windows/TweetImpl.CefSharp/Component/BrowserComponentBase.cs +++ b/windows/TweetImpl.CefSharp/Component/BrowserComponentBase.cs @@ -59,11 +59,15 @@ private void OnLoadError(object? sender, LoadErrorEventArgs e) { } private void OnFrameLoadStart(object? sender, FrameLoadStartEventArgs e) { - base.OnFrameLoadStart(e.Url, e.Frame); + if (!string.IsNullOrEmpty(e.Url)) { + base.OnFrameLoadStart(e.Url, e.Frame); + } } private void OnFrameLoadEnd(object? sender, FrameLoadEndEventArgs e) { - base.OnFrameLoadEnd(e.Url, e.Frame); + if (!string.IsNullOrEmpty(e.Url)) { + base.OnFrameLoadEnd(e.Url, e.Frame); + } } } }