Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
e4f2f4b9
Unverified
Commit
e4f2f4b9
authored
Nov 29, 2018
by
Don Gagne
Committed by
GitHub
Nov 29, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7047 from DonLakeFlyer/ParameterManager
Initialization of Fact prior to Qt init causes crash.
parents
a535fe6f
6f6a526f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
3 deletions
+1
-3
ParameterManager.cc
src/FactSystem/ParameterManager.cc
+0
-2
ParameterManager.h
src/FactSystem/ParameterManager.h
+1
-1
No files found.
src/FactSystem/ParameterManager.cc
View file @
e4f2f4b9
...
@@ -26,8 +26,6 @@ QGC_LOGGING_CATEGORY(ParameterManagerVerbose1Log, "ParameterManagerVer
...
@@ -26,8 +26,6 @@ QGC_LOGGING_CATEGORY(ParameterManagerVerbose1Log, "ParameterManagerVer
QGC_LOGGING_CATEGORY
(
ParameterManagerVerbose2Log
,
"ParameterManagerVerbose2Log"
)
QGC_LOGGING_CATEGORY
(
ParameterManagerVerbose2Log
,
"ParameterManagerVerbose2Log"
)
QGC_LOGGING_CATEGORY
(
ParameterManagerDebugCacheFailureLog
,
"ParameterManagerDebugCacheFailureLog"
)
// Turn on to debug parameter cache crc misses
QGC_LOGGING_CATEGORY
(
ParameterManagerDebugCacheFailureLog
,
"ParameterManagerDebugCacheFailureLog"
)
// Turn on to debug parameter cache crc misses
Fact
ParameterManager
::
_defaultFact
;
const
char
*
ParameterManager
::
_cachedMetaDataFilePrefix
=
"ParameterFactMetaData"
;
const
char
*
ParameterManager
::
_cachedMetaDataFilePrefix
=
"ParameterFactMetaData"
;
const
char
*
ParameterManager
::
_jsonParametersKey
=
"parameters"
;
const
char
*
ParameterManager
::
_jsonParametersKey
=
"parameters"
;
const
char
*
ParameterManager
::
_jsonCompIdKey
=
"compId"
;
const
char
*
ParameterManager
::
_jsonCompIdKey
=
"compId"
;
...
...
src/FactSystem/ParameterManager.h
View file @
e4f2f4b9
...
@@ -201,7 +201,7 @@ private:
...
@@ -201,7 +201,7 @@ private:
QMutex
_dataMutex
;
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
*
_cachedMetaDataFilePrefix
;
static
const
char
*
_jsonParametersKey
;
static
const
char
*
_jsonParametersKey
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment