diff options
| author |  Yuri Kunde Schlesner | 2016-07-09 20:39:19 -0700 |
|---|---|---|
| committer |  GitHub | 2016-07-09 20:39:19 -0700 |
| commit | ffda82eea546830d15284810e91e58c5b6627a0c (patch) | |
| tree | 5d0cb7b7f17ef73bd382b08cce863f1b05ed10df /src/citra_qt/main.cpp | |
| parent | Merge pull request #1940 from JamePeng/fix-archive-error-code (diff) | |
| parent | Qt: add system settings config tab (diff) | |
| download | yuzu-ffda82eea546830d15284810e91e58c5b6627a0c.tar.gz yuzu-ffda82eea546830d15284810e91e58c5b6627a0c.tar.xz yuzu-ffda82eea546830d15284810e91e58c5b6627a0c.zip | |
Merge pull request #1894 from wwylele/set-config-block
Implement config savegame editing & clean up
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 0ed1ffa5a..6fe5d7a3f 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp | |||
| @@ -508,7 +508,7 @@ void GMainWindow::ToggleWindowMode() { | |||
| 508 | } | 508 | } |
| 509 | 509 | ||
| 510 | void GMainWindow::OnConfigure() { | 510 | void GMainWindow::OnConfigure() { |
| 511 | ConfigureDialog configureDialog(this); | 511 | ConfigureDialog configureDialog(this, emulation_running); |
| 512 | auto result = configureDialog.exec(); | 512 | auto result = configureDialog.exec(); |
| 513 | if (result == QDialog::Accepted) | 513 | if (result == QDialog::Accepted) |
| 514 | { | 514 | { |