mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-07 04:00:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Ensure browser is initialized properly before executing javascript

Browse Source
This commit is contained in:
Ylva Selling
2022-10-07 16:20:43 -04:00
parent 59209928e6
commit c710aa3a34
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/skybrowser/skybrowsermodule_lua.inl
View File

@@ -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));
}
}

2
modules/skybrowser/src/screenspaceskybrowser.cpp
View File

@@ -326,7 +326,7 @@ void ScreenSpaceSkyBrowser::update() {
_isInitialized = false;
}
if (_radiusIsDirty) {
if (_radiusIsDirty && _isInitialized) {
setBorderRadius(_borderRadius);
_radiusIsDirty = false;
}