From bda86d6e6a2ccfcd2fd173a79155276026ab0c97 Mon Sep 17 00:00:00 2001
From: Jim Taylor <jhtaylor20@gmail.com>
Date: Tue, 22 Nov 2016 01:40:38 -0500
Subject: [PATCH] Fix issue 4957 Taranis splash screens formatted incorrectly.
 (#4064)

---
 companion/src/apppreferencesdialog.cpp  | 2 +-
 companion/src/customizesplashdialog.cpp | 4 ++--
 companion/src/helpers.cpp               | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/companion/src/apppreferencesdialog.cpp b/companion/src/apppreferencesdialog.cpp
index 3e4c4bb90..947658462 100644
--- a/companion/src/apppreferencesdialog.cpp
+++ b/companion/src/apppreferencesdialog.cpp
@@ -337,7 +337,7 @@ bool AppPreferencesDialog::displayImage( QString fileName )
 
   // Use the firmware name to determine splash width
   int width = SPLASH_WIDTH;
-  if (g.profile[g.id()].fwType().contains("taranis"))
+  if (g.profile[g.id()].fwType().contains("x9d"))
     width = SPLASHX9D_WIDTH;
   
   ui->imageLabel->setPixmap( makePixMap( image, g.profile[g.id()].fwType()));
diff --git a/companion/src/customizesplashdialog.cpp b/companion/src/customizesplashdialog.cpp
index 7db15312a..acc1a5472 100644
--- a/companion/src/customizesplashdialog.cpp
+++ b/companion/src/customizesplashdialog.cpp
@@ -54,14 +54,14 @@ bool Side::displayImage( QString fileName, Source pictSource )
     if (pictSource== PICT)
       *format = image.width()>WIDTH_9X ? LCDTARANIS : LCD9X;
     else if (pictSource == PROFILE)
-      *format = (g.profile[g.id()].fwType().contains("taranis")) ? LCDTARANIS : LCD9X; 
+      *format = (g.profile[g.id()].fwType().contains("x9d")) ? LCDTARANIS : LCD9X; 
   }
   if (image.isNull()) {
     return false;
   }
   // Load image
   if (*format==LCDTARANIS) {
-    imageLabel->setPixmap( makePixMap( image, "taranis" ));
+    imageLabel->setPixmap( makePixMap( image, "x9d" ));
     imageLabel->setFixedSize(WIDTH_TARANIS*2, HEIGHT_TARANIS*2);
   }
   else {
diff --git a/companion/src/helpers.cpp b/companion/src/helpers.cpp
index 1d54a3219..b77fd88b7 100644
--- a/companion/src/helpers.cpp
+++ b/companion/src/helpers.cpp
@@ -834,7 +834,7 @@ void startSimulation(QWidget * parent, RadioData & radioData, int modelIdx)
 
 QPixmap makePixMap( QImage image, QString firmwareType )
 {
-  if (firmwareType.contains( "taranis" )) {
+  if (firmwareType.contains( "x9d" )) {
     image = image.convertToFormat(QImage::Format_RGB32);
     QRgb col;
     int gray;