From 2a0461a76f05d2e27028f371e302a3cced4a3ccc Mon Sep 17 00:00:00 2001 From: chylex <contact@chylex.com> Date: Fri, 21 Jul 2017 12:43:10 +0200 Subject: [PATCH] Add safeguards for accessing TweetDeckBridge.LastHighlightedTweetImages --- Core/Handling/ContextMenuBase.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Core/Handling/ContextMenuBase.cs b/Core/Handling/ContextMenuBase.cs index edeb0d0e..3b273e58 100644 --- a/Core/Handling/ContextMenuBase.cs +++ b/Core/Handling/ContextMenuBase.cs @@ -43,6 +43,10 @@ public virtual void OnBeforeContextMenu(IWebBrowser browserControl, IBrowser bro bool hasTweetImage = !string.IsNullOrEmpty(TweetDeckBridge.LastRightClickedImage); lastHighlightedTweetImageList = TweetDeckBridge.LastHighlightedTweetImages; + if (!TwitterUtils.IsTweetDeckWebsite(frame) || browser.IsLoading){ + lastHighlightedTweetImageList = StringUtils.EmptyArray; + } + if (parameters.TypeFlags.HasFlag(ContextMenuType.Link) && !parameters.UnfilteredLinkUrl.EndsWith("tweetdeck.twitter.com/#", StringComparison.Ordinal) && !hasTweetImage){ if (RegexTwitterAccount.Value.IsMatch(parameters.UnfilteredLinkUrl)){ model.AddItem((CefMenuCommand)MenuOpenLinkUrl, "Open account in browser");