Fix vr 2d vr tablet crash
Showing the changes to libraries/script-engine/src/TabletScriptingInterface.cpp (1 of 2 files). Show all
Unified · Split
| @@ -231,8 +231,10 @@ void TabletProxy::setToolbarMode(bool toolbarMode) { · 230 unmodified lines | ||
| 231 | 231 | connect(tabletRootWindow, &QmlWindowClass::fromQml, this, &TabletProxy::fromQml); |
| 232 | 232 | }); |
| 233 | 233 | } else { |
| 234 | + _state = State::Home; | |
| 234 | 235 | removeButtonsFromToolbar(); |
| 235 | 236 | addButtonsToHomeScreen(); |
| 237 | + emit screenChanged(QVariant("Home"), QVariant(TABLET_SOURCE_URL)); | |
| 236 | 238 | |
| 237 | 239 | // destroy desktop window |
| 238 | 240 | if (_desktopWindow) { |
| @@ -642,8 +644,8 @@ void TabletProxy::addButtonsToHomeScreen() { · 403 unmodified lines | ||
| 642 | 644 | for (auto& buttonProxy : _tabletButtonProxies) { |
| 643 | 645 | addButtonProxyToQmlTablet(tablet, buttonProxy.data()); |
| 644 | 646 | } |
| 645 | − auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader"); | |
| 646 | − QObject::disconnect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToHomeScreen())); | |
| 647 | + auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader"); | |
| 648 | + QObject::disconnect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToHomeScreen())); | |
| 647 | 649 | } |
| 648 | 650 | |
| 649 | 651 | QObject* TabletProxy::getTabletSurface() { |