Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 20:58:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #13970 from jherico/fix/fb18149

Browse source 
Ensure a web overlay doesn't access an invalid tabletScriptingInterface
This commit is contained in:
Brad Hefta-Gaub 2018-09-11 09:31:33 -07:00 committed by GitHub
commit ab1718747b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/ui/overlays/Web3DOverlay.cpp
View file

@ -132,7 +132,9 @@ void Web3DOverlay::destroyWebSurface() {
if (rootItem && rootItem->objectName() == "tabletRoot") { if (rootItem && rootItem->objectName() == "tabletRoot") {
auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>(); auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
tabletScriptingInterface->setQmlTabletRoot("com.highfidelity.interface.tablet.system", nullptr); if (tabletScriptingInterface) {
tabletScriptingInterface->setQmlTabletRoot("com.highfidelity.interface.tablet.system", nullptr);
}
} }
// Fix for crash in QtWebEngineCore when rapidly switching domains // Fix for crash in QtWebEngineCore when rapidly switching domains