summaryrefslogtreecommitdiffstats
path: root/src/citra_qt/configure_dialog.cpp
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2016-07-10 05:39:19 +0200
committerGitHub <noreply@github.com>2016-07-10 05:39:19 +0200
commitffda82eea546830d15284810e91e58c5b6627a0c (patch)
tree5d0cb7b7f17ef73bd382b08cce863f1b05ed10df /src/citra_qt/configure_dialog.cpp
parentMerge pull request #1940 from JamePeng/fix-archive-error-code (diff)
parentQt: add system settings config tab (diff)
downloadyuzu-ffda82eea546830d15284810e91e58c5b6627a0c.tar
yuzu-ffda82eea546830d15284810e91e58c5b6627a0c.tar.gz
yuzu-ffda82eea546830d15284810e91e58c5b6627a0c.tar.bz2
yuzu-ffda82eea546830d15284810e91e58c5b6627a0c.tar.lz
yuzu-ffda82eea546830d15284810e91e58c5b6627a0c.tar.xz
yuzu-ffda82eea546830d15284810e91e58c5b6627a0c.tar.zst
yuzu-ffda82eea546830d15284810e91e58c5b6627a0c.zip
Diffstat (limited to 'src/citra_qt/configure_dialog.cpp')
-rw-r--r--src/citra_qt/configure_dialog.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/citra_qt/configure_dialog.cpp b/src/citra_qt/configure_dialog.cpp
index 2f0317fe0..77c266d01 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();
}