From 2530caa16e100e2efe01720c00e803806822004e Mon Sep 17 00:00:00 2001
From: Damjan Adamic <projectkk2glider@gmail.com>
Date: Sun, 23 Aug 2015 21:10:49 +0200
Subject: [PATCH] Flight mode representation reverted back (additional fix),
 unneeded condition removed

---
 companion/src/modelprinter.cpp      | 2 +-
 companion/src/multimodelprinter.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/companion/src/modelprinter.cpp b/companion/src/modelprinter.cpp
index 349f37c94..9b029c290 100644
--- a/companion/src/modelprinter.cpp
+++ b/companion/src/modelprinter.cpp
@@ -391,7 +391,7 @@ QString ModelPrinter::printFlightModeName(int index)
 {
   const FlightModeData & fm = model.flightModeData[index];
   if (strlen(fm.name) > 0) {
-    return tr("%1").arg(fm.name);
+    return QString("%1").arg(fm.name);
   }
   else {
     return tr("FM%1").arg(index);
diff --git a/companion/src/multimodelprinter.cpp b/companion/src/multimodelprinter.cpp
index 963aeb4a2..4ff6b52dc 100644
--- a/companion/src/multimodelprinter.cpp
+++ b/companion/src/multimodelprinter.cpp
@@ -102,7 +102,7 @@ MultiModelPrinter::MultiModelPrinter(Firmware * firmware):
 MultiModelPrinter::~MultiModelPrinter()
 {
   for(int i=0; i<modelPrinters.size(); i++) {
-    if (modelPrinters[i]) delete modelPrinters[i];
+    delete modelPrinters[i];
   }
 }