From 98c1a1832697696bb94a809f1c5be6068f0166a2 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sat, 11 Feb 2017 21:02:23 +1300 Subject: [PATCH] Fix accumulating signal connections --- .../script-engine/src/TabletScriptingInterface.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/script-engine/src/TabletScriptingInterface.cpp b/libraries/script-engine/src/TabletScriptingInterface.cpp index 215c3a98e6..e40736b201 100644 --- a/libraries/script-engine/src/TabletScriptingInterface.cpp +++ b/libraries/script-engine/src/TabletScriptingInterface.cpp @@ -368,13 +368,13 @@ void TabletProxy::addButtonsToMenuScreen() { } QQuickItem* VrMenu = loader->findChild("tabletMenu"); - if (!VrMenu) { - return; + if (VrMenu) { + auto offscreenUi = DependencyManager::get(); + QObject* menu = offscreenUi->getRootMenu(); + QMetaObject::invokeMethod(VrMenu, "setRootMenu", Qt::AutoConnection, Q_ARG(QVariant, QVariant::fromValue(menu))); } - auto offscreenUi = DependencyManager::get(); - QObject* menu = offscreenUi->getRootMenu(); - QMetaObject::invokeMethod(VrMenu, "setRootMenu", Qt::AutoConnection, Q_ARG(QVariant, QVariant::fromValue(menu))); + QObject::disconnect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToMenuScreen())); } void TabletProxy::removeButtonsFromHomeScreen() {