Disable switching to current display mode. Fix linux version

string.

Author: Rob-Bishop

BUILDME.sh

@@ -47,4 +47,4 @@ cat rpi-firmware-head >> "../output/"BUILT-"$(date +"%Y-%m-%d")"
 cd ..
 
 clear
-echo "Build complete. Copy files in \'output\' directory onto a clean FAT formatted SD card to use."
+echo "Build complete. Copy files in 'output' directory onto a clean FAT formatted SD card to use."

buildroot/kernelconfig-recovery

@@ -1,5 +1,5 @@
 CONFIG_EXPERIMENTAL=y
-CONFIG_LOCALVERSION="rescue"
+CONFIG_LOCALVERSION="-rescue"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y

output

@@ -38,6 +38,9 @@
 /* Flag to keep track wheter or not we already repartitioned. */
 bool MainWindow::_partInited = false;
 
+/* Flag to keep track of current display mode. */
+int MainWindow::_currentMode = 0;
+
 /* Which ListItem (if any) points to the recommended image. */
 QListWidgetItem *recommendedItem = NULL;
 
@@ -405,17 +408,29 @@ bool MainWindow::eventFilter(QObject *, QEvent *event)
         // experimentally by using keys 1-4. NOOBS will default to using HDMI preferred mode.
 
         // HDMI preferred mode
-        if (keyEvent->key() == Qt::Key_1)
+        if (keyEvent->key() == Qt::Key_1 && _currentMode != 0)
+        {
             displayMode("-p", tr("HDMI preferred mode"));
+            _currentMode = 0;
+        }
         // HDMI safe mode
-        if (keyEvent->key() == Qt::Key_2)
+        if (keyEvent->key() == Qt::Key_2 && _currentMode != 1)
+        {
             displayMode("-e \'DMT 4\'", tr("HDMI safe mode"));
+            _currentMode = 1;
+        }
         // Composite PAL
-        if (keyEvent->key() == Qt::Key_3)
+        if (keyEvent->key() == Qt::Key_3 && _currentMode != 2)
+        {
             displayMode("-c \'NTSC 4:3\'", tr("composite PAL mode"));
-        // Composite NTSC
-        if (keyEvent->key() == Qt::Key_4)
+            _currentMode = 2;
+        }
+         // Composite NTSC
+        if (keyEvent->key() == Qt::Key_4 && _currentMode != 3)
+        {
             displayMode("-c \'PAL 4:3\'", tr("composite NTSC mode"));
+            _currentMode = 3;
+        }
         // Catch Return key to trigger OS install
         if (keyEvent->key() == Qt::Key_Return)
             on_actionWrite_image_to_disk_triggered();

recovery/mainwindow.cpp

@@ -36,6 +36,7 @@ class MainWindow : public QMainWindow
     int _kcpos;
     bool _silent, _allowSilent;
     static bool _partInited;
+    static int _currentMode;
     QString *_currentLang;
     QSplashScreen *_splash;
     LanguageDialog *_ld;