diff options
| author | bunnei <bunneidev@gmail.com> | 2019-01-23 20:46:37 -0500 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-23 20:46:37 -0500 | 
| commit | 9be3fedcaa9f792db93143e60f8b6f4bd02e43f1 (patch) | |
| tree | 07e6f58a85f042fdb5613b0a7ea805ccc75e7e0b /src/yuzu | |
| parent | d5a4707f659010061dd07a2a7af4e1c88a8796ae (diff) | |
| parent | a94a828b6c5c1a1631ef0c414da570e8c22bc3f5 (diff) | |
Merge pull request #2049 from FearlessTobi/port-3928
Port citra-emu/citra#3928: "citra_qt: Log settings on launch"
Diffstat (limited to 'src/yuzu')
| -rw-r--r-- | src/yuzu/configuration/configure_dialog.cpp | 1 | ||||
| -rw-r--r-- | src/yuzu/main.cpp | 3 | 
2 files changed, 4 insertions, 0 deletions
| diff --git a/src/yuzu/configuration/configure_dialog.cpp b/src/yuzu/configuration/configure_dialog.cpp index d802443d0..777050405 100644 --- a/src/yuzu/configuration/configure_dialog.cpp +++ b/src/yuzu/configuration/configure_dialog.cpp @@ -39,6 +39,7 @@ void ConfigureDialog::applyConfiguration() {      ui->debugTab->applyConfiguration();      ui->webTab->applyConfiguration();      Settings::Apply(); +    Settings::LogSettings();  }  void ConfigureDialog::PopulateSelectionList() { diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 2c3e27c2e..ca6ddebcb 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -2042,6 +2042,9 @@ int main(int argc, char* argv[]) {      GMainWindow main_window;      // After settings have been loaded by GMainWindow, apply the filter      main_window.show(); + +    Settings::LogSettings(); +      int result = app.exec();      detached_tasks.WaitForAllTasks();      return result; | 
