diff options
| author | 2016-04-04 21:55:08 -0400 | |
|---|---|---|
| committer | 2016-04-04 21:55:08 -0400 | |
| commit | b39340849631f565cf5c32bfdbab9fdc0bd4db9d (patch) | |
| tree | 8112be75d7f65ced275221040231a0ca1ae4f415 /src/citra_qt/main.cpp | |
| parent | Merge pull request #1640 from lioncash/cpp14 (diff) | |
| parent | remove debug code (diff) | |
| download | yuzu-b39340849631f565cf5c32bfdbab9fdc0bd4db9d.tar.gz yuzu-b39340849631f565cf5c32bfdbab9fdc0bd4db9d.tar.xz yuzu-b39340849631f565cf5c32bfdbab9fdc0bd4db9d.zip | |
Merge pull request #1620 from LFsWang/path
Fix filename&path encode problem on Windows
Diffstat (limited to 'src/citra_qt/main.cpp')
| -rw-r--r-- | src/citra_qt/main.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 32cceaf7e..f621f5d66 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp | |||
| @@ -417,7 +417,7 @@ void GMainWindow::UpdateRecentFiles() { | |||
| 417 | } | 417 | } |
| 418 | 418 | ||
| 419 | void GMainWindow::OnGameListLoadFile(QString game_path) { | 419 | void GMainWindow::OnGameListLoadFile(QString game_path) { |
| 420 | BootGame(game_path.toLocal8Bit().data()); | 420 | BootGame(game_path.toStdString()); |
| 421 | } | 421 | } |
| 422 | 422 | ||
| 423 | void GMainWindow::OnMenuLoadFile() { | 423 | void GMainWindow::OnMenuLoadFile() { |
| @@ -428,7 +428,7 @@ void GMainWindow::OnMenuLoadFile() { | |||
| 428 | if (!filename.isEmpty()) { | 428 | if (!filename.isEmpty()) { |
| 429 | settings.setValue("romsPath", QFileInfo(filename).path()); | 429 | settings.setValue("romsPath", QFileInfo(filename).path()); |
| 430 | 430 | ||
| 431 | BootGame(filename.toLocal8Bit().data()); | 431 | BootGame(filename.toStdString()); |
| 432 | } | 432 | } |
| 433 | } | 433 | } |
| 434 | 434 | ||
| @@ -440,7 +440,7 @@ void GMainWindow::OnMenuLoadSymbolMap() { | |||
| 440 | if (!filename.isEmpty()) { | 440 | if (!filename.isEmpty()) { |
| 441 | settings.setValue("symbolsPath", QFileInfo(filename).path()); | 441 | settings.setValue("symbolsPath", QFileInfo(filename).path()); |
| 442 | 442 | ||
| 443 | LoadSymbolMap(filename.toLocal8Bit().data()); | 443 | LoadSymbolMap(filename.toStdString()); |
| 444 | } | 444 | } |
| 445 | } | 445 | } |
| 446 | 446 | ||
| @@ -461,7 +461,7 @@ void GMainWindow::OnMenuRecentFile() { | |||
| 461 | QString filename = action->data().toString(); | 461 | QString filename = action->data().toString(); |
| 462 | QFileInfo file_info(filename); | 462 | QFileInfo file_info(filename); |
| 463 | if (file_info.exists()) { | 463 | if (file_info.exists()) { |
| 464 | BootGame(filename.toLocal8Bit().data()); | 464 | BootGame(filename.toStdString()); |
| 465 | } else { | 465 | } else { |
| 466 | // Display an error message and remove the file from the list. | 466 | // Display an error message and remove the file from the list. |
| 467 | QMessageBox::information(this, tr("File not found"), tr("File \"%1\" not found").arg(filename)); | 467 | QMessageBox::information(this, tr("File not found"), tr("File \"%1\" not found").arg(filename)); |