Fix accumulating signal connections

This commit is contained in:
David Rowe 2017-02-11 21:02:23 +13:00
parent a08347936e
commit 98c1a18326

View file

@ -368,13 +368,13 @@ void TabletProxy::addButtonsToMenuScreen() {
} }
QQuickItem* VrMenu = loader->findChild<QQuickItem*>("tabletMenu"); QQuickItem* VrMenu = loader->findChild<QQuickItem*>("tabletMenu");
if (!VrMenu) { if (VrMenu) {
return; auto offscreenUi = DependencyManager::get<OffscreenUi>();
QObject* menu = offscreenUi->getRootMenu();
QMetaObject::invokeMethod(VrMenu, "setRootMenu", Qt::AutoConnection, Q_ARG(QVariant, QVariant::fromValue(menu)));
} }
auto offscreenUi = DependencyManager::get<OffscreenUi>(); QObject::disconnect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToMenuScreen()));
QObject* menu = offscreenUi->getRootMenu();
QMetaObject::invokeMethod(VrMenu, "setRootMenu", Qt::AutoConnection, Q_ARG(QVariant, QVariant::fromValue(menu)));
} }
void TabletProxy::removeButtonsFromHomeScreen() { void TabletProxy::removeButtonsFromHomeScreen() {