citra-emu
/
citra
Archived
1
0
Fork 0
Code

citra_qt/configure_system: fix string comparison (#4830) 

country_names has type std::array<char*>. Pointer comparison to test empty string is wrong
This commit is contained in:
Weiyi Wang 2019-07-14 13:26:23 -04:00 committed by Ben
parent 1c5a55b3cb
commit e689847b11
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/citra_qt/configuration/configure_system.cpp
View File

@ -2,6 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <cstring>
#include <QMessageBox> #include <QMessageBox>
#include "citra_qt/configuration/configure_system.h" #include "citra_qt/configuration/configure_system.h"
#include "citra_qt/ui_settings.h" #include "citra_qt/ui_settings.h"
@ -227,7 +228,7 @@ ConfigureSystem::ConfigureSystem(QWidget* parent) : QWidget(parent), ui(new Ui::
connect(ui->button_regenerate_console_id, &QPushButton::clicked, this, connect(ui->button_regenerate_console_id, &QPushButton::clicked, this,
&ConfigureSystem::RefreshConsoleID); &ConfigureSystem::RefreshConsoleID);
for (u8 i = 0; i < country_names.size(); i++) { for (u8 i = 0; i < country_names.size(); i++) {
if (country_names.at(i) != "") { if (std::strcmp(country_names.at(i), "") != 0) {
ui->combo_country->addItem(tr(country_names.at(i)), i); ui->combo_country->addItem(tr(country_names.at(i)), i);
} }
} }