diff options
| author |  bunnei | 2016-09-02 09:36:08 -0400 |
|---|---|---|
| committer |  GitHub | 2016-09-02 09:36:08 -0400 |
| commit | 274b925a9705ebd5c4ec242c70d44249dc9f2b0d (patch) | |
| tree | 01751cd1c7329b041aaa1d40cf1bf8b098c61567 /src/citra_qt/main.cpp | |
| parent | Merge pull request #2040 from citra-emu/revert-2037-msvc-relwithdebinfo (diff) | |
| parent | Qt: unify running detection (diff) | |
| download | yuzu-274b925a9705ebd5c4ec242c70d44249dc9f2b0d.tar.gz yuzu-274b925a9705ebd5c4ec242c70d44249dc9f2b0d.tar.xz yuzu-274b925a9705ebd5c4ec242c70d44249dc9f2b0d.zip | |
Merge pull request #2044 from wwylele/system-setting-fix
Qt: unify running detection of system settings configure
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 9fd4482f6..cf467532f 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp | |||
| @@ -510,7 +510,7 @@ void GMainWindow::ToggleWindowMode() { | |||
| 510 | } | 510 | } |
| 511 | 511 | ||
| 512 | void GMainWindow::OnConfigure() { | 512 | void GMainWindow::OnConfigure() { |
| 513 | ConfigureDialog configureDialog(this, emulation_running); | 513 | ConfigureDialog configureDialog(this); |
| 514 | auto result = configureDialog.exec(); | 514 | auto result = configureDialog.exec(); |
| 515 | if (result == QDialog::Accepted) | 515 | if (result == QDialog::Accepted) |
| 516 | { | 516 | { |