Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 20:31:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Address shutdown crash

Browse source
This commit is contained in:
Brad Davis 2016-02-23 18:15:29 -08:00
parent 8e8e23452f
commit b63e4b9d1f
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libraries/ui/src/VrMenu.cpp
View file

@ -124,18 +124,25 @@ void VrMenu::addMenu(QMenu* menu) {
new MenuUserData(menu, result); new MenuUserData(menu, result);
auto menuAction = menu->menuAction(); auto menuAction = menu->menuAction();
updateQmlItemFromAction(result, menuAction); updateQmlItemFromAction(result, menuAction);
QObject::connect(menuAction, &QAction::changed, [=] { auto connection = QObject::connect(menuAction, &QAction::changed, [=] {
updateQmlItemFromAction(result, menuAction); updateQmlItemFromAction(result, menuAction);
}); });
QObject::connect(qApp, &QCoreApplication::aboutToQuit, [=] {
QObject::disconnect(connection);
});
} }
void bindActionToQmlAction(QObject* qmlAction, QAction* action) { void bindActionToQmlAction(QObject* qmlAction, QAction* action) {
new MenuUserData(action, qmlAction); new MenuUserData(action, qmlAction);
updateQmlItemFromAction(qmlAction, action); updateQmlItemFromAction(qmlAction, action);
QObject::connect(action, &QAction::changed, [=] { auto connection = QObject::connect(action, &QAction::changed, [=] {
updateQmlItemFromAction(qmlAction, action); updateQmlItemFromAction(qmlAction, action);
}); });
QObject::connect(qApp, &QCoreApplication::aboutToQuit, [=] {
QObject::disconnect(connection);
});
QObject::connect(action, &QAction::toggled, [=](bool checked) { QObject::connect(action, &QAction::toggled, [=](bool checked) {
qmlAction->setProperty("checked", checked); qmlAction->setProperty("checked", checked);
}); });