History

fixed load script issue

Dante Ruiz committed 9 years ago

Commit a147ce31 parent 096b2e83 files · +9 −2Browse files

Showing the changes to libraries/script-engine/src/TabletScriptingInterface.cpp (1 of 3 files). Show all

Unified · Split

libraries/script-engine/src/TabletScriptingInterface.cpp+2−2
@@ -204,7 +204,7 @@ void TabletProxy::gotoMenuScreen() { · 203 unmodified lines
204204 if (_qmlTabletRoot) {
205205 if (_state != State::Menu) {
206206 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);
208208 QMetaObject::invokeMethod(_qmlTabletRoot, "loadSource", Q_ARG(const QVariant&, QVariant(VRMENU_SOURCE_URL)));
209209 _state = State::Menu;
210210 }
@@ -215,7 +215,7 @@ void TabletProxy::gotoHomeScreen() { · 4 unmodified lines
215215 if (_qmlTabletRoot) {
216216 if (_state != State::Home) {
217217 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);
219219 QMetaObject::invokeMethod(_qmlTabletRoot, "loadSource", Q_ARG(const QVariant&, QVariant(TABLET_SOURCE_URL)));
220220 QMetaObject::invokeMethod(_qmlTabletRoot, "playButtonClickSound");
221221 _state = State::Home;