Fix a potential crash when disconnecting older setups
This commit is contained in:
parent
45581e7f30
commit
d4b2400a1c
@ -48,16 +48,17 @@ void EnergyLogs::setEngine(Engine *engine)
|
|||||||
if (!m_engine) {
|
if (!m_engine) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
connect(engine, &Engine::destroyed, this, [=](){
|
||||||
|
if (engine == m_engine) {
|
||||||
|
m_engine = nullptr;
|
||||||
|
emit engineChanged();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
if (m_engine->jsonRpcClient()->experiences().value("Energy").toString() >= "1.0") {
|
if (m_engine->jsonRpcClient()->experiences().value("Energy").toString() >= "1.0") {
|
||||||
m_engine->jsonRpcClient()->registerNotificationHandler(this, "Energy", "notificationReceivedInternal");
|
m_engine->jsonRpcClient()->registerNotificationHandler(this, "Energy", "notificationReceivedInternal");
|
||||||
|
|
||||||
connect(engine, &Engine::destroyed, this, [=](){
|
|
||||||
if (engine == m_engine) {
|
|
||||||
m_engine = nullptr;
|
|
||||||
emit engineChanged();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
if (m_ready && !m_loadingInhibited) {
|
if (m_ready && !m_loadingInhibited) {
|
||||||
fetchLogs();
|
fetchLogs();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -49,7 +49,7 @@ public:
|
|||||||
Q_ENUM(SampleRate)
|
Q_ENUM(SampleRate)
|
||||||
|
|
||||||
explicit EnergyLogs(QObject *parent = nullptr);
|
explicit EnergyLogs(QObject *parent = nullptr);
|
||||||
~EnergyLogs();
|
virtual ~EnergyLogs();
|
||||||
|
|
||||||
Engine *engine() const;
|
Engine *engine() const;
|
||||||
void setEngine(Engine *engine);
|
void setEngine(Engine *engine);
|
||||||
|
|||||||
Reference in New Issue
Block a user