Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
31cc61db
Commit
31cc61db
authored
Apr 20, 2015
by
Don Gagne
Browse files
Merge pull request #1486 from DonLakeFlyer/AirframeConfig
Fix crash on reconnect
parents
dbe032ea
2ba91017
Changes
1
Show whitespace changes
Inline
Side-by-side
src/QGCApplication.cc
View file @
31cc61db
...
...
@@ -619,7 +619,7 @@ void QGCApplication::reconnectAfterWait(int waitSeconds)
LinkInterface
*
link
=
linkManager
->
getLinks
()[
0
];
// Save the link configuration so we can restart the link laster
_reconnectLinkConfig
=
linkManager
->
getLinks
()[
0
]
->
getLinkConfiguration
();
_reconnectLinkConfig
=
LinkConfiguration
::
duplicateSettings
(
linkManager
->
getLinks
()[
0
]
->
getLinkConfiguration
()
)
;
// Disconnect and wait
...
...
@@ -629,6 +629,9 @@ void QGCApplication::reconnectAfterWait(int waitSeconds)
void
QGCApplication
::
_reconnect
(
void
)
{
Q_ASSERT
(
_reconnectLinkConfig
);
qgcApp
()
->
restoreOverrideCursor
();
LinkManager
::
instance
()
->
createConnectedLink
(
_reconnectLinkConfig
);
_reconnectLinkConfig
=
NULL
;
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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