Commit f68be0ca authored by Don Gagne's avatar Don Gagne

result used initialized at end of function based on if conditions

Fixing -Wuninitialized
parent 06c36b8b
...@@ -136,22 +136,15 @@ void APMToolBar::connectMAV() ...@@ -136,22 +136,15 @@ void APMToolBar::connectMAV()
{ {
qDebug() << "APMToolBar: connectMAV "; qDebug() << "APMToolBar: connectMAV ";
bool connected = false; if (LinkManager::instance()->getSerialLinks().count() > 0) {
if (LinkManager::instance()->getSerialLinks().count() > 0)
connected = LinkManager::instance()->getSerialLinks().last()->isConnected();
bool result; bool result;
bool connected = LinkManager::instance()->getSerialLinks().last()->isConnected();
if (!connected && LinkManager::instance()->getSerialLinks().count() == 0) if (connected) {
{
// No Link so prompt to connect one
MainWindow::instance()->addLink();
} else if (!connected) {
// Need to Connect Link
result = LinkManager::instance()->getSerialLinks().last()->connect();
} else if (connected && LinkManager::instance()->getSerialLinks().count() > 0) {
// result need to be the opposite of success. // result need to be the opposite of success.
result = !LinkManager::instance()->getSerialLinks().last()->disconnect(); result = !LinkManager::instance()->getSerialLinks().last()->disconnect();
} else {
// Need to Connect Link
result = LinkManager::instance()->getSerialLinks().last()->connect();
} }
qDebug() << "result = " << result; qDebug() << "result = " << result;
...@@ -159,6 +152,10 @@ void APMToolBar::connectMAV() ...@@ -159,6 +152,10 @@ void APMToolBar::connectMAV()
setConnection(result); setConnection(result);
emit MAVConnected(result); emit MAVConnected(result);
} else {
// No Link so prompt to connect one
MainWindow::instance()->addLink();
}
} }
void APMToolBar::setConnection(bool connection) void APMToolBar::setConnection(bool connection)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment