Fix onLoaded event: only trigered by the top-level frame

stigmee · Apr 21, 2022 · dea5fca · dea5fca
1 parent b315ffd
commit dea5fca
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/gdcef/src/browser.cpp b/gdcef/src/browser.cpp
@@ -161,13 +161,17 @@ void BrowserView::onPaint(CefRefPtr<CefBrowser> /*browser*/,
 
 //------------------------------------------------------------------------------
 void BrowserView::onLoadEnd(CefRefPtr<CefBrowser> /*browser*/,
-                            CefRefPtr<CefFrame> /*frame*/,
-                            int /*httpStatusCode*/)
+                            CefRefPtr<CefFrame> frame,
+                            int httpStatusCode)
 {
-    GDCEF_DEBUG_VAL("has ended loading");
+    // Emit signal only when top-level frame has succeeded.
+    if ((httpStatusCode == 200) && (frame->IsMain()))
+    {
+        GDCEF_DEBUG_VAL("has ended loading " << frame->GetURL());
 
-    // Emit signal for Godot script
-    emit_signal("page_loaded", this);
+        // Emit signal for Godot script
+        emit_signal("page_loaded", this);
+    }
 }
 
 //------------------------------------------------------------------------------