From 20c155e67fe35364d8552276ff3c14f9d7454fe5 Mon Sep 17 00:00:00 2001
From: Tobias Taschner <TcT2k@users.noreply.github.com>
Date: Thu, 16 Jan 2020 19:54:24 +0100
Subject: [PATCH] Send wxEVT_WEBVIEW_NAVIGATED after updating history

---
 src/msw/webview_edge.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/msw/webview_edge.cpp b/src/msw/webview_edge.cpp
index 636ffb6a57..a6209a18d4 100644
--- a/src/msw/webview_edge.cpp
+++ b/src/msw/webview_edge.cpp
@@ -218,8 +218,6 @@ HRESULT wxWebViewEdgeImpl::OnNavigationCompleted(IWebView2WebView* WXUNUSED(send
     }
     else
     {
-        wxWebViewEvent evt(wxEVT_WEBVIEW_NAVIGATED, m_ctrl->GetId(), uri, wxString());
-        m_ctrl->HandleWindowEvent(evt);
         if (m_historyEnabled && !m_historyLoadingFromList &&
             (uri == m_ctrl->GetCurrentURL()) ||
             (m_ctrl->GetCurrentURL().substr(0, 4) == "file" &&
@@ -238,6 +236,8 @@ HRESULT wxWebViewEdgeImpl::OnNavigationCompleted(IWebView2WebView* WXUNUSED(send
         }
         //Reset as we are done now
         m_historyLoadingFromList = false;
+        wxWebViewEvent evt(wxEVT_WEBVIEW_NAVIGATED, m_ctrl->GetId(), uri, wxString());
+        m_ctrl->HandleWindowEvent(evt);
     }
     return S_OK;
 }