chaos/VideoPlayer
1
0
Fork 0
Code Activity

Fix?

Browse source
This commit is contained in:
namedkitten 2020-04-28 03:08:37 +01:00
parent cb4c65704e
commit ab6a2acf05
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main.cpp
View file

@ -119,7 +119,7 @@ main(int argc, char* argv[])
// TODO: launch a opengl window or use offscreen to see if GL_ARB_framebuffer_object // TODO: launch a opengl window or use offscreen to see if GL_ARB_framebuffer_object
// can be found // can be found
if (! settings.value("Backend/disableSunxiCheck", false).toBool()) { 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]; char buf[16];
if (fread(buf, 1, sizeof (buf), fd) > 0) { if (fread(buf, 1, sizeof (buf), fd) > 0) {
launcherLogger->info("Running on sunxi, switching to NoFBO."); launcherLogger->info("Running on sunxi, switching to NoFBO.");

4
src/qml/Dialogs/SettingsItems/LanguageSettings.qml
View file

@ -7,7 +7,7 @@ ComboBox {
height: 30 height: 30
editable: false editable: false
pressed: true pressed: true
model: Object.values(Translations.languages) model: Object.keys(Translations.languages).map(function(key) {return Translations.languages[key];}
delegate: ItemDelegate { delegate: ItemDelegate {
height: 25 height: 25
width: languageSelector.width width: languageSelector.width
@ -25,6 +25,6 @@ ComboBox {
i18n.language = Object.keys(Translations.languages).filter(function(key) {return Translations.languages[key] === currentText})[0]; i18n.language = Object.keys(Translations.languages).filter(function(key) {return Translations.languages[key] === currentText})[0];
} }
Component.onCompleted: { Component.onCompleted: {
currentIndex = languageSelector.indexOfValue(Translations.languages[i18n.language]) currentIndex = languageSelector.find(Translations.languages[i18n.language])
} }
} }