Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 05:48:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #9534 from druiz17/tabletBug

Browse source 
Fixed tablet from crashing when clicking on items in the menu
This commit is contained in:
Seth Alves 2017-01-27 11:09:50 -08:00 committed by GitHub
commit b9087f4b04
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/script-engine/src/TabletScriptingInterface.cpp
View file

@ -203,6 +203,7 @@ void TabletProxy::setQmlTabletRoot(QQuickItem* qmlTabletRoot, QObject* qmlOffscr
void TabletProxy::gotoMenuScreen() { void TabletProxy::gotoMenuScreen() {
if (_qmlTabletRoot) { if (_qmlTabletRoot) {
if (_state != State::Menu) { if (_state != State::Menu) {
removeButtonsFromHomeScreen();
auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader"); auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader");
QObject::connect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToMenuScreen()), Qt::DirectConnection); QObject::connect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToMenuScreen()), Qt::DirectConnection);
QMetaObject::invokeMethod(_qmlTabletRoot, "loadSource", Q_ARG(const QVariant&, QVariant(VRMENU_SOURCE_URL))); QMetaObject::invokeMethod(_qmlTabletRoot, "loadSource", Q_ARG(const QVariant&, QVariant(VRMENU_SOURCE_URL)));