Fix?
This commit is contained in:
parent
cb4c65704e
commit
ab6a2acf05
|
@ -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.");
|
||||
|
|
|
@ -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])
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue