diff options
| author |  bunnei | 2014-05-22 22:57:45 -0400 |
|---|---|---|
| committer | bunnei | 2014-05-22 22:57:45 -0400 |
| commit | 32c314c99290a52f1f870ecf8c677e3792ed09c4 (patch) | |
| tree | 1cea62bc320d51ebb217e7c361ae10b65b71dd45 /src/citra_qt/main.cpp | |
| parent | Merge branch 'master' of https://github.com/citra-emu/citra (diff) | |
| parent | core: added Kernel::Reschedule() call to check for thread changes, shortened ... (diff) | |
| download | yuzu-32c314c99290a52f1f870ecf8c677e3792ed09c4.tar.gz yuzu-32c314c99290a52f1f870ecf8c677e3792ed09c4.tar.xz yuzu-32c314c99290a52f1f870ecf8c677e3792ed09c4.zip | |
Merge branch 'threading'
Diffstat (limited to 'src/citra_qt/main.cpp')
| -rw-r--r-- | src/citra_qt/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 76e0c68c3..9be982909 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp | |||
| @@ -142,7 +142,7 @@ void GMainWindow::BootGame(const char* filename) | |||
| 142 | 142 | ||
| 143 | void GMainWindow::OnMenuLoadFile() | 143 | void GMainWindow::OnMenuLoadFile() |
| 144 | { | 144 | { |
| 145 | QString filename = QFileDialog::getOpenFileName(this, tr("Load file"), QString(), tr("3DS homebrew (*.elf *.dat *.bin)")); | 145 | QString filename = QFileDialog::getOpenFileName(this, tr("Load file"), QString(), tr("3DS homebrew (*.elf *.axf *.dat *.bin)")); |
| 146 | if (filename.size()) | 146 | if (filename.size()) |
| 147 | BootGame(filename.toLatin1().data()); | 147 | BootGame(filename.toLatin1().data()); |
| 148 | } | 148 | } |