From c2990c2421a5db983d9061d8c0f93986510174dc Mon Sep 17 00:00:00 2001
From: hawkeyexp <hawkeyexp@googlemail.com>
Date: Tue, 7 Aug 2018 22:13:39 +0200
Subject: [PATCH] Fix audioinjector preselection

---
 src/autoapp/UI/SettingsWindow.cpp | 7 ++-----
 src/autoapp/UI/mainwindow.ui      | 2 +-
 src/autoapp/UI/settingswindow.ui  | 7 +------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/autoapp/UI/SettingsWindow.cpp b/src/autoapp/UI/SettingsWindow.cpp
index fa1952c..057beaa 100644
--- a/src/autoapp/UI/SettingsWindow.cpp
+++ b/src/autoapp/UI/SettingsWindow.cpp
@@ -509,11 +509,8 @@ void SettingsWindow::loadSystemValues()
         if (getparams[23] == "iqaudio-digi-wm8804-audio") {
             dac = "IQaudIO - Pi-Digi Plus";
         }
-        if (getparams[23] == "audioinjector-zero") {
-            dac = "Audioinjector - Zero";
-        }
-        if (getparams[23] == "audioinjector-stereo") {
-            dac = "Audioinjector - Stereo";
+        if (getparams[23] == "audioinjector-wm8731-audio") {
+            dac = "Audioinjector - Zero/Stereo";
         }
         if (getparams[23] == "hifiberry-dac") {
             dac = "Hifiberry - DAC";
diff --git a/src/autoapp/UI/mainwindow.ui b/src/autoapp/UI/mainwindow.ui
index f8684a7..b6c14c8 100644
--- a/src/autoapp/UI/mainwindow.ui
+++ b/src/autoapp/UI/mainwindow.ui
@@ -770,7 +770,6 @@ QPushButton:pressed { background: orange; border: none; }</string>
    <zorder>pushButtonCameraShow</zorder>
    <zorder>pushButtonCameraHide</zorder>
    <zorder>pushButtonExit</zorder>
-   <zorder>horizontalSliderBrightness</zorder>
    <zorder>Digital_clock</zorder>
    <zorder>phoneConnected</zorder>
    <zorder>versionString</zorder>
@@ -787,6 +786,7 @@ QPushButton:pressed { background: orange; border: none; }</string>
    <zorder>pushButtonCancel</zorder>
    <zorder>systemConfigInProgress</zorder>
    <zorder>systemDebugging</zorder>
+   <zorder>horizontalSliderBrightness</zorder>
    <zorder>kodiBG</zorder>
    <zorder>pushButtonRearcamBack</zorder>
   </widget>
diff --git a/src/autoapp/UI/settingswindow.ui b/src/autoapp/UI/settingswindow.ui
index 4d328d9..6c30213 100644
--- a/src/autoapp/UI/settingswindow.ui
+++ b/src/autoapp/UI/settingswindow.ui
@@ -3422,12 +3422,7 @@ subcontrol-position: center left;
       </item>
       <item>
        <property name="text">
-        <string>Audioinjector - Zero</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>Audioinjector - Stereo</string>
+        <string>Audioinjector - Zero/Stereo</string>
        </property>
       </item>
       <item>