From 004fb5c78ad69020266402b0fdae016e7da4e9b2 Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Fri, 9 Sep 2016 00:50:36 +0100 Subject: [PATCH] refs #759 Work around crash when cache value update slot is called on a partially-constructed owner. --- src/blackgui/components/dbmappingcomponent.cpp | 2 ++ src/blackgui/components/dbmappingcomponent.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/blackgui/components/dbmappingcomponent.cpp b/src/blackgui/components/dbmappingcomponent.cpp index 9a14ec5d1..2c58c54a6 100644 --- a/src/blackgui/components/dbmappingcomponent.cpp +++ b/src/blackgui/components/dbmappingcomponent.cpp @@ -133,6 +133,8 @@ namespace BlackGui // vPilot this->initVPilotLoading(); + + m_swiftDbUser.setNotifySlot(&CDbMappingComponent::ps_userChanged); } CDbMappingComponent::~CDbMappingComponent() diff --git a/src/blackgui/components/dbmappingcomponent.h b/src/blackgui/components/dbmappingcomponent.h index 0894265bc..c72495f52 100644 --- a/src/blackgui/components/dbmappingcomponent.h +++ b/src/blackgui/components/dbmappingcomponent.h @@ -293,7 +293,7 @@ namespace BlackGui QScopedPointer m_autoStashDialog; //!< dialog auto stashing QScopedPointer m_modelModifyDialog; //!< dialog when modifying models BlackMisc::Simulation::FsCommon::CVPilotRulesReader m_vPilotReader; //!< read vPilot rules - BlackMisc::CData m_swiftDbUser {this, &CDbMappingComponent::ps_userChanged}; + BlackMisc::CData m_swiftDbUser { this }; BlackMisc::CDigestSignal m_dsStashedModelsChanged { this, &CDbMappingComponent::ps_digestStashedModelsChanged, &CDbMappingComponent::ps_onStashedModelsChangedDigest, 750, 25 }; const bool vPilotSupport = true; //!< vPilot support bool m_vPilot1stInit = true; //!< vPilot extensions initaliazed?