From ab6a2acf05da11d04eab7ac058e700ec585d8fcb Mon Sep 17 00:00:00 2001
From: namedkitten <kitteh@kitteh.pw>
Date: Tue, 28 Apr 2020 03:08:37 +0100
Subject: [PATCH] Fix?

---
 src/main.cpp                                       | 2 +-
 src/qml/Dialogs/SettingsItems/LanguageSettings.qml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 4bff60e..c5886b4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -119,7 +119,7 @@ main(int argc, char* argv[])
   // TODO: launch a opengl window or use offscreen to see if GL_ARB_framebuffer_object
   // can be found
   if (! settings.value("Backend/disableSunxiCheck", false).toBool()) {
-    FILE *fd = popen("grep sunxi /proc/modules", "r");
+    FILE *fd = popen("grep sun[x8]i /proc/modules", "r");
     char buf[16];
     if (fread(buf, 1, sizeof (buf), fd) > 0) {
       launcherLogger->info("Running on sunxi, switching to NoFBO.");
diff --git a/src/qml/Dialogs/SettingsItems/LanguageSettings.qml b/src/qml/Dialogs/SettingsItems/LanguageSettings.qml
index b896375..d373b77 100644
--- a/src/qml/Dialogs/SettingsItems/LanguageSettings.qml
+++ b/src/qml/Dialogs/SettingsItems/LanguageSettings.qml
@@ -7,7 +7,7 @@ ComboBox {
     height: 30
     editable: false
     pressed: true
-    model: Object.values(Translations.languages)
+    model: Object.keys(Translations.languages).map(function(key) {return Translations.languages[key];}
     delegate: ItemDelegate {
         height: 25
         width: languageSelector.width
@@ -25,6 +25,6 @@ ComboBox {
         i18n.language = Object.keys(Translations.languages).filter(function(key) {return Translations.languages[key] === currentText})[0];
     }
     Component.onCompleted: {
-        currentIndex = languageSelector.indexOfValue(Translations.languages[i18n.language])
+        currentIndex = languageSelector.find(Translations.languages[i18n.language])
     }
 }