Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-15 14:59:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Prevent crash on switching to 3D display twice

Browse source
This commit is contained in:
Brad Davis 2017-05-04 12:04:21 -07:00
parent 7cb2bff4c5
commit fb995bebf1
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -37,15 +37,17 @@ public:
qmlObject->setObjectName(uuid.toString()); qmlObject->setObjectName(uuid.toString());
// Make sure we can find it again in the future // Make sure we can find it again in the future
updateQmlItemFromAction(); updateQmlItemFromAction();
auto connection = QObject::connect(action, &QAction::changed, [=] { _changedConnection = QObject::connect(action, &QAction::changed, [=] {
updateQmlItemFromAction(); updateQmlItemFromAction();
}); });
QObject::connect(qApp, &QCoreApplication::aboutToQuit, [=] { _shutdownConnection = QObject::connect(qApp, &QCoreApplication::aboutToQuit, [=] {
QObject::disconnect(connection); QObject::disconnect(_changedConnection);
}); });
} }
~MenuUserData() { ~MenuUserData() {
QObject::disconnect(_changedConnection);
QObject::disconnect(_shutdownConnection);
_action->setUserData(USER_DATA_ID, nullptr); _action->setUserData(USER_DATA_ID, nullptr);
_qml->setUserData(USER_DATA_ID, nullptr); _qml->setUserData(USER_DATA_ID, nullptr);
} }
@ -104,6 +106,8 @@ public:
private: private:
MenuUserData(const MenuUserData&); MenuUserData(const MenuUserData&);
QMetaObject::Connection _shutdownConnection;
QMetaObject::Connection _changedConnection;
QAction* _action { nullptr }; QAction* _action { nullptr };
QObject* _qml { nullptr }; QObject* _qml { nullptr };
}; };