hipnosuer
/
Zuma
forked from ShuriZma/suyu
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #1541 from LFsWang/path 

Fix Qt string encode problem on Windows
This commit is contained in:
bunnei 2016-03-27 22:03:07 -04:00
parent e366f60cff 933af7af66
commit e815e4a6aa
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/citra_qt/config.cpp
View File

@ -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();
} }

4
src/citra_qt/game_list.cpp
View File

@ -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)),
}); });
} }