From 6f6a526f66e1c70c3dd81aa941ce3d51b264ae61 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Thu, 29 Nov 2018 12:15:31 -0800 Subject: [PATCH] Initialization of Fact prior to Qt init causes crash. --- src/FactSystem/ParameterManager.cc | 2 -- src/FactSystem/ParameterManager.h | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/FactSystem/ParameterManager.cc b/src/FactSystem/ParameterManager.cc index 3704580ef3..6b157e2e22 100644 --- a/src/FactSystem/ParameterManager.cc +++ b/src/FactSystem/ParameterManager.cc @@ -26,8 +26,6 @@ QGC_LOGGING_CATEGORY(ParameterManagerVerbose1Log, "ParameterManagerVer QGC_LOGGING_CATEGORY(ParameterManagerVerbose2Log, "ParameterManagerVerbose2Log") QGC_LOGGING_CATEGORY(ParameterManagerDebugCacheFailureLog, "ParameterManagerDebugCacheFailureLog") // Turn on to debug parameter cache crc misses -Fact ParameterManager::_defaultFact; - const char* ParameterManager::_cachedMetaDataFilePrefix = "ParameterFactMetaData"; const char* ParameterManager::_jsonParametersKey = "parameters"; const char* ParameterManager::_jsonCompIdKey = "compId"; diff --git a/src/FactSystem/ParameterManager.h b/src/FactSystem/ParameterManager.h index 2a69908cd1..75479924dd 100644 --- a/src/FactSystem/ParameterManager.h +++ b/src/FactSystem/ParameterManager.h @@ -201,7 +201,7 @@ private: QMutex _dataMutex; - static Fact _defaultFact; ///< Used to return default fact, when parameter not found + Fact _defaultFact; ///< Used to return default fact, when parameter not found static const char* _cachedMetaDataFilePrefix; static const char* _jsonParametersKey; -- GitLab