From c710aa3a34b4c72651f41b6f92e400192aae08ff Mon Sep 17 00:00:00 2001
From: Ylva Selling <ylva.selling@gmail.com>
Date: Fri, 7 Oct 2022 16:20:43 -0400
Subject: [PATCH] Ensure browser is initialized properly before executing
 javascript

---
 modules/skybrowser/skybrowsermodule_lua.inl      | 3 ++-
 modules/skybrowser/src/screenspaceskybrowser.cpp | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/skybrowser/skybrowsermodule_lua.inl b/modules/skybrowser/skybrowsermodule_lua.inl
index 309f2b04d0..488b81eb4e 100644
--- a/modules/skybrowser/skybrowsermodule_lua.inl
+++ b/modules/skybrowser/skybrowsermodule_lua.inl
@@ -672,7 +672,8 @@ namespace {
 
     SkyBrowserModule* module = global::moduleEngine->module<SkyBrowserModule>();
     TargetBrowserPair* pair = module->pair(identifier);
-    if (pair) {
+    // Make sure the webpage has loaded properly before executing javascript on it
+    if (pair && pair->browser()->isInitialized()) {
         pair->setBorderRadius(std::clamp(radius, 0.0, 1.0));
     }
 }
diff --git a/modules/skybrowser/src/screenspaceskybrowser.cpp b/modules/skybrowser/src/screenspaceskybrowser.cpp
index 4e973ef289..6936337919 100644
--- a/modules/skybrowser/src/screenspaceskybrowser.cpp
+++ b/modules/skybrowser/src/screenspaceskybrowser.cpp
@@ -326,7 +326,7 @@ void ScreenSpaceSkyBrowser::update() {
         _isInitialized = false;
     }
 
-    if (_radiusIsDirty) {
+    if (_radiusIsDirty && _isInitialized) {
         setBorderRadius(_borderRadius);
         _radiusIsDirty = false;
     }