mirror of
https://github.com/citra-mirror/citra.git
synced 2024-08-20 10:23:23 +02:00
Merge pull request #1541 from LFsWang/path
Fix Qt string encode problem on Windows
This commit is contained in:
commit
e815e4a6aa
@ -16,7 +16,7 @@ Config::Config() {
|
|||||||
// TODO: Don't hardcode the path; let the frontend decide where to put the config files.
|
// TODO: Don't hardcode the path; let the frontend decide where to put the config files.
|
||||||
qt_config_loc = FileUtil::GetUserPath(D_CONFIG_IDX) + "qt-config.ini";
|
qt_config_loc = FileUtil::GetUserPath(D_CONFIG_IDX) + "qt-config.ini";
|
||||||
FileUtil::CreateFullPath(qt_config_loc);
|
FileUtil::CreateFullPath(qt_config_loc);
|
||||||
qt_config = new QSettings(QString::fromStdString(qt_config_loc), QSettings::IniFormat);
|
qt_config = new QSettings(QString::fromLocal8Bit(qt_config_loc.c_str()), QSettings::IniFormat);
|
||||||
|
|
||||||
Reload();
|
Reload();
|
||||||
}
|
}
|
||||||
|
@ -66,7 +66,7 @@ void GameList::ValidateEntry(const QModelIndex& item)
|
|||||||
|
|
||||||
if (file_path.isEmpty())
|
if (file_path.isEmpty())
|
||||||
return;
|
return;
|
||||||
std::string std_file_path = file_path.toStdString();
|
std::string std_file_path = file_path.toLocal8Bit();
|
||||||
if (!FileUtil::Exists(std_file_path) || FileUtil::IsDirectory(std_file_path))
|
if (!FileUtil::Exists(std_file_path) || FileUtil::IsDirectory(std_file_path))
|
||||||
return;
|
return;
|
||||||
emit GameChosen(file_path);
|
emit GameChosen(file_path);
|
||||||
@ -148,7 +148,7 @@ void GameListWorker::AddFstEntriesToGameList(const std::string& dir_path, bool d
|
|||||||
|
|
||||||
emit EntryReady({
|
emit EntryReady({
|
||||||
new GameListItem(QString::fromStdString(Loader::GetFileTypeString(filetype))),
|
new GameListItem(QString::fromStdString(Loader::GetFileTypeString(filetype))),
|
||||||
new GameListItemPath(QString::fromStdString(physical_name)),
|
new GameListItemPath(QString::fromLocal8Bit(physical_name.c_str())),
|
||||||
new GameListItemSize(FileUtil::GetSize(physical_name)),
|
new GameListItemSize(FileUtil::GetSize(physical_name)),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user