Showing the changes to libraries/script-engine/src/TabletScriptingInterface.cpp (1 of 3 files). Show all
Unified · Split
| @@ -204,7 +204,7 @@ void TabletProxy::gotoMenuScreen() { · 203 unmodified lines | |||
| 204 | if (_qmlTabletRoot) { | 204 | if (_qmlTabletRoot) { |
| 205 | if (_state != State::Menu) { | 205 | if (_state != State::Menu) { |
| 206 | auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader"); | 206 | auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader"); |
| 207 | QObject::connect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToMenuScreen())); | 207 | QObject::connect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToMenuScreen()), Qt::DirectConnection); |
| 208 | QMetaObject::invokeMethod(_qmlTabletRoot, "loadSource", Q_ARG(const QVariant&, QVariant(VRMENU_SOURCE_URL))); | 208 | QMetaObject::invokeMethod(_qmlTabletRoot, "loadSource", Q_ARG(const QVariant&, QVariant(VRMENU_SOURCE_URL))); |
| 209 | _state = State::Menu; | 209 | _state = State::Menu; |
| 210 | } | 210 | } |
| @@ -215,7 +215,7 @@ void TabletProxy::gotoHomeScreen() { · 4 unmodified lines | |||
| 215 | if (_qmlTabletRoot) { | 215 | if (_qmlTabletRoot) { |
| 216 | if (_state != State::Home) { | 216 | if (_state != State::Home) { |
| 217 | auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader"); | 217 | auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader"); |
| 218 | QObject::connect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToHomeScreen())); | 218 | QObject::connect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToHomeScreen()), Qt::DirectConnection); |
| 219 | QMetaObject::invokeMethod(_qmlTabletRoot, "loadSource", Q_ARG(const QVariant&, QVariant(TABLET_SOURCE_URL))); | 219 | QMetaObject::invokeMethod(_qmlTabletRoot, "loadSource", Q_ARG(const QVariant&, QVariant(TABLET_SOURCE_URL))); |
| 220 | QMetaObject::invokeMethod(_qmlTabletRoot, "playButtonClickSound"); | 220 | QMetaObject::invokeMethod(_qmlTabletRoot, "playButtonClickSound"); |
| 221 | _state = State::Home; | 221 | _state = State::Home; |