diff options
| author | 2015-10-22 22:41:39 -0400 | |
|---|---|---|
| committer | 2015-10-22 22:41:39 -0400 | |
| commit | 8c385a3fc640b66d8d082ad81889363199b3036c (patch) | |
| tree | a5f48dd2ed0fb820842031ef38cb48e9da969568 /src | |
| parent | Merge pull request #1187 from bunnei/shader-gen (diff) | |
| parent | change file path encoding to Local8bit() (diff) | |
| download | yuzu-8c385a3fc640b66d8d082ad81889363199b3036c.tar.gz yuzu-8c385a3fc640b66d8d082ad81889363199b3036c.tar.xz yuzu-8c385a3fc640b66d8d082ad81889363199b3036c.zip | |
Merge pull request #1209 from wwylele/file-path-encoding
citra-qt: Change file path encoding
Diffstat (limited to 'src')
| -rw-r--r-- | src/citra_qt/game_list.cpp | 2 | ||||
| -rw-r--r-- | src/citra_qt/main.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/citra_qt/game_list.cpp b/src/citra_qt/game_list.cpp index dade3c212..e925f08a7 100644 --- a/src/citra_qt/game_list.cpp +++ b/src/citra_qt/game_list.cpp | |||
| @@ -80,7 +80,7 @@ void GameList::DonePopulating() | |||
| 80 | void GameList::PopulateAsync(const QString& dir_path, bool deep_scan) | 80 | void GameList::PopulateAsync(const QString& dir_path, bool deep_scan) |
| 81 | { | 81 | { |
| 82 | if (!FileUtil::Exists(dir_path.toStdString()) || !FileUtil::IsDirectory(dir_path.toStdString())) { | 82 | if (!FileUtil::Exists(dir_path.toStdString()) || !FileUtil::IsDirectory(dir_path.toStdString())) { |
| 83 | LOG_ERROR(Frontend, "Could not find game list folder at %s", dir_path.toLatin1().data()); | 83 | LOG_ERROR(Frontend, "Could not find game list folder at %s", dir_path.toLocal8Bit().data()); |
| 84 | return; | 84 | return; |
| 85 | } | 85 | } |
| 86 | 86 | ||
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index d25220e25..bcff6be64 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp | |||
| @@ -355,7 +355,7 @@ void GMainWindow::UpdateRecentFiles() { | |||
| 355 | } | 355 | } |
| 356 | 356 | ||
| 357 | void GMainWindow::OnGameListLoadFile(QString game_path) { | 357 | void GMainWindow::OnGameListLoadFile(QString game_path) { |
| 358 | BootGame(game_path.toLatin1().data()); | 358 | BootGame(game_path.toLocal8Bit().data()); |
| 359 | } | 359 | } |
| 360 | 360 | ||
| 361 | void GMainWindow::OnMenuLoadFile() { | 361 | void GMainWindow::OnMenuLoadFile() { |
| @@ -367,7 +367,7 @@ void GMainWindow::OnMenuLoadFile() { | |||
| 367 | settings.setValue("romsPath", QFileInfo(filename).path()); | 367 | settings.setValue("romsPath", QFileInfo(filename).path()); |
| 368 | StoreRecentFile(filename); | 368 | StoreRecentFile(filename); |
| 369 | 369 | ||
| 370 | BootGame(filename.toLatin1().data()); | 370 | BootGame(filename.toLocal8Bit().data()); |
| 371 | } | 371 | } |
| 372 | } | 372 | } |
| 373 | 373 | ||
| @@ -379,7 +379,7 @@ void GMainWindow::OnMenuLoadSymbolMap() { | |||
| 379 | if (!filename.isEmpty()) { | 379 | if (!filename.isEmpty()) { |
| 380 | settings.setValue("symbolsPath", QFileInfo(filename).path()); | 380 | settings.setValue("symbolsPath", QFileInfo(filename).path()); |
| 381 | 381 | ||
| 382 | LoadSymbolMap(filename.toLatin1().data()); | 382 | LoadSymbolMap(filename.toLocal8Bit().data()); |
| 383 | } | 383 | } |
| 384 | } | 384 | } |
| 385 | 385 | ||
| @@ -400,7 +400,7 @@ void GMainWindow::OnMenuRecentFile() { | |||
| 400 | QString filename = action->data().toString(); | 400 | QString filename = action->data().toString(); |
| 401 | QFileInfo file_info(filename); | 401 | QFileInfo file_info(filename); |
| 402 | if (file_info.exists()) { | 402 | if (file_info.exists()) { |
| 403 | BootGame(filename.toLatin1().data()); | 403 | BootGame(filename.toLocal8Bit().data()); |
| 404 | StoreRecentFile(filename); // Put the filename on top of the list | 404 | StoreRecentFile(filename); // Put the filename on top of the list |
| 405 | } else { | 405 | } else { |
| 406 | // Display an error message and remove the file from the list. | 406 | // Display an error message and remove the file from the list. |