citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Merge pull request #1209 from wwylele/file-path-encoding 

citra-qt: Change file path encoding
This commit is contained in:
bunnei 2015-10-22 22:41:39 -04:00
parent 4195d9b3f8 6e57389172
commit 8c385a3fc6
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/citra_qt/game_list.cpp
View File

@ -80,7 +80,7 @@ void GameList::DonePopulating()
void GameList::PopulateAsync(const QString& dir_path, bool deep_scan) void GameList::PopulateAsync(const QString& dir_path, bool deep_scan)
{ {
if (!FileUtil::Exists(dir_path.toStdString()) || !FileUtil::IsDirectory(dir_path.toStdString())) { if (!FileUtil::Exists(dir_path.toStdString()) || !FileUtil::IsDirectory(dir_path.toStdString())) {
LOG_ERROR(Frontend, "Could not find game list folder at %s", dir_path.toLatin1().data()); LOG_ERROR(Frontend, "Could not find game list folder at %s", dir_path.toLocal8Bit().data());
return; return;
} }

8
src/citra_qt/main.cpp
View File

@ -355,7 +355,7 @@ void GMainWindow::UpdateRecentFiles() {
} }
void GMainWindow::OnGameListLoadFile(QString game_path) { void GMainWindow::OnGameListLoadFile(QString game_path) {
BootGame(game_path.toLatin1().data()); BootGame(game_path.toLocal8Bit().data());
} }
void GMainWindow::OnMenuLoadFile() { void GMainWindow::OnMenuLoadFile() {
@ -367,7 +367,7 @@ void GMainWindow::OnMenuLoadFile() {
settings.setValue("romsPath", QFileInfo(filename).path()); settings.setValue("romsPath", QFileInfo(filename).path());
StoreRecentFile(filename); StoreRecentFile(filename);
BootGame(filename.toLatin1().data()); BootGame(filename.toLocal8Bit().data());
} }
} }
@ -379,7 +379,7 @@ void GMainWindow::OnMenuLoadSymbolMap() {
if (!filename.isEmpty()) { if (!filename.isEmpty()) {
settings.setValue("symbolsPath", QFileInfo(filename).path()); settings.setValue("symbolsPath", QFileInfo(filename).path());
LoadSymbolMap(filename.toLatin1().data()); LoadSymbolMap(filename.toLocal8Bit().data());
} }
} }
@ -400,7 +400,7 @@ void GMainWindow::OnMenuRecentFile() {
QString filename = action->data().toString(); QString filename = action->data().toString();
QFileInfo file_info(filename); QFileInfo file_info(filename);
if (file_info.exists()) { if (file_info.exists()) {
BootGame(filename.toLatin1().data()); BootGame(filename.toLocal8Bit().data());
StoreRecentFile(filename); // Put the filename on top of the list StoreRecentFile(filename); // Put the filename on top of the list
} else { } else {
// Display an error message and remove the file from the list. // Display an error message and remove the file from the list.