From 35a11d5a71ce424c04072bae49926f775e9f7077 Mon Sep 17 00:00:00 2001
From: m_thread <fredrik@arvidssons.org>
Date: Tue, 16 Dec 2014 18:26:52 +0100
Subject: [PATCH] OP-1628 Uncrustify

---
 .../src/plugins/setupwizard/pages/autoupdatepage.cpp         | 5 ++---
 .../src/plugins/uploader/uploadergadgetfactory.cpp           | 2 +-
 .../src/plugins/uploader/uploadergadgetwidget.cpp            | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/autoupdatepage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/autoupdatepage.cpp
index 2680fb222..3c0e7d01b 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/pages/autoupdatepage.cpp
+++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/autoupdatepage.cpp
@@ -47,8 +47,6 @@ void AutoUpdatePage::autoUpdate()
 
 void AutoUpdatePage::updateStatus(uploader::ProgressStep status, QVariant value)
 {
-    QString msg;
-
     switch (status) {
     case uploader::WAITING_DISCONNECT:
         disableButtons();
@@ -65,6 +63,7 @@ void AutoUpdatePage::updateStatus(uploader::ProgressStep status, QVariant value)
         ui->levellinProgressBar->setValue(value.toInt());
         break;
     case uploader::JUMP_TO_BL:
+        disableButtons();
         ui->levellinProgressBar->setValue(value.toInt());
         ui->levellinProgressBar->setMaximum(5);
         ui->statusLabel->setText(tr("Board going into bootloader mode. Please wait."));
@@ -81,7 +80,7 @@ void AutoUpdatePage::updateStatus(uploader::ProgressStep status, QVariant value)
         ui->statusLabel->setText(tr("Uploading description."));
         break;
     case uploader::BOOTING:
-        ui->statusLabel->setText(tr("Booting the board%. Please wait").arg(value.toString()));
+        ui->statusLabel->setText(tr("Booting the board%1. Please wait").arg(value.toString()));
         break;
     case uploader::SUCCESS:
         enableButtons(true);
diff --git a/ground/openpilotgcs/src/plugins/uploader/uploadergadgetfactory.cpp b/ground/openpilotgcs/src/plugins/uploader/uploadergadgetfactory.cpp
index f913e7932..ab086320a 100644
--- a/ground/openpilotgcs/src/plugins/uploader/uploadergadgetfactory.cpp
+++ b/ground/openpilotgcs/src/plugins/uploader/uploadergadgetfactory.cpp
@@ -46,7 +46,7 @@ Core::IUAVGadget *UploaderGadgetFactory::createGadget(QWidget *parent)
     isautocapable = gadgetWidget->autoUpdateCapable();
     connect(this, SIGNAL(autoUpdate(bool)), gadgetWidget, SLOT(autoUpdate(bool)));
     connect(this, SIGNAL(reboot()), gadgetWidget, SLOT(systemReset()));
-    connect(gadgetWidget, SIGNAL(progressUpdate(uploader::ProgressStep,QVariant)), this, SIGNAL(progressUpdate(uploader::ProgressStep, QVariant)));
+    connect(gadgetWidget, SIGNAL(progressUpdate(uploader::ProgressStep, QVariant)), this, SIGNAL(progressUpdate(uploader::ProgressStep, QVariant)));
     return new UploaderGadget(QString("Uploader"), gadgetWidget, parent);
 }
 
diff --git a/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp b/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
index 6e97beb79..b162a98b2 100644
--- a/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
@@ -738,7 +738,7 @@ bool UploaderGadgetWidget::autoUpdate(bool erase)
     TelemetryManager *telemetryManager = pluginManager->getObject<TelemetryManager>();
     Q_ASSERT(telemetryManager);
 
-    if(!telemetryManager->isConnected()) {
+    if (!telemetryManager->isConnected()) {
         progressUpdate(BOOTING, erase ? tr(" and erasing settings") : QVariant());
         ResultEventLoop eventLoop;