diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2016-07-09 20:39:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-09 20:39:19 -0700 |
| commit | ffda82eea546830d15284810e91e58c5b6627a0c (patch) | |
| tree | 5d0cb7b7f17ef73bd382b08cce863f1b05ed10df /src/citra_qt/configure_dialog.cpp | |
| parent | 6fa7b1f4863a2e6bde07c3f7ddca3ac52da39757 (diff) | |
| parent | ec3e99eec762a380322b0c058e30a69e92fb3c1d (diff) | |
Merge pull request #1894 from wwylele/set-config-block
Implement config savegame editing & clean up
Diffstat (limited to 'src/citra_qt/configure_dialog.cpp')
| -rw-r--r-- | src/citra_qt/configure_dialog.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/citra_qt/configure_dialog.cpp b/src/citra_qt/configure_dialog.cpp index 2f0317fe03..77c266d011 100644 --- a/src/citra_qt/configure_dialog.cpp +++ b/src/citra_qt/configure_dialog.cpp @@ -9,9 +9,10 @@ #include "core/settings.h" -ConfigureDialog::ConfigureDialog(QWidget *parent) : +ConfigureDialog::ConfigureDialog(QWidget *parent, bool running) : QDialog(parent), - ui(new Ui::ConfigureDialog) + ui(new Ui::ConfigureDialog), + emulation_running(running) { ui->setupUi(this); this->setConfiguration(); @@ -21,10 +22,14 @@ ConfigureDialog::~ConfigureDialog() { } void ConfigureDialog::setConfiguration() { + // System tab needs set manually + // depending on whether emulation is running + ui->systemTab->setConfiguration(emulation_running); } void ConfigureDialog::applyConfiguration() { ui->generalTab->applyConfiguration(); + ui->systemTab->applyConfiguration(); ui->audioTab->applyConfiguration(); ui->debugTab->applyConfiguration(); } |