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
e5b4707b
Commit
e5b4707b
authored
9 years ago
by
Don Gagne
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2459 from DonLakeFlyer/CompId
qWarning instead of assert
parents
09e505e2
8f595261
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
ParameterLoader.cc
src/FactSystem/ParameterLoader.cc
+3
-1
No files found.
src/FactSystem/ParameterLoader.cc
View file @
e5b4707b
...
@@ -349,7 +349,9 @@ int ParameterLoader::_actualComponentId(int componentId)
...
@@ -349,7 +349,9 @@ int ParameterLoader::_actualComponentId(int componentId)
{
{
if
(
componentId
==
FactSystem
::
defaultComponentId
)
{
if
(
componentId
==
FactSystem
::
defaultComponentId
)
{
componentId
=
_defaultComponentId
;
componentId
=
_defaultComponentId
;
Q_ASSERT
(
componentId
!=
FactSystem
::
defaultComponentId
);
if
(
componentId
==
FactSystem
::
defaultComponentId
)
{
qWarning
()
<<
"Default component id not set"
;
}
}
}
return
componentId
;
return
componentId
;
...
...
This diff is collapsed.
Click to expand it.
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