From eabc4bee4cd9533dfe2da04c8c2cde7612f47c6d Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 26 Apr 2022 16:16:37 -0400 Subject: [PATCH] fix: Save combo report before closing settings dialog Bugs (fixed): * Combo report configuration doesn't save on OK click (does save on Apply click though) --- src/client/spark/Risk/Combo/ComboReportSettingsDialog.xaml | 1 + src/client/spark/Risk/Combo/ComboReportVM.cs | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Risk/Combo/ComboReportSettingsDialog.xaml b/src/client/spark/Risk/Combo/ComboReportSettingsDialog.xaml index 660645374..5c923deff 100644 --- a/src/client/spark/Risk/Combo/ComboReportSettingsDialog.xaml +++ b/src/client/spark/Risk/Combo/ComboReportSettingsDialog.xaml @@ -36,6 +36,7 @@ OKCommandParameter="{Binding result}" ApplyCommand="{Binding commit_cmd}" ApplyCommandParameter="{Binding result}" + CloseOnOK="False" /> diff --git a/src/client/spark/Risk/Combo/ComboReportVM.cs b/src/client/spark/Risk/Combo/ComboReportVM.cs index 0c083b956..59e5e2cdd 100644 --- a/src/client/spark/Risk/Combo/ComboReportVM.cs +++ b/src/client/spark/Risk/Combo/ComboReportVM.cs @@ -52,10 +52,13 @@ namespace mbts.analytics { Window mk_settings_win() { var vm = new ComboReportSettingsVM(model.accounts_source.OnDispatcher()); vm.configuration_vm.load_from(_data.report); - vm.SubscribeDisposed(vm.commit_cmd.subscribe_executed(_model.save)); var win = new ComboReportSettingsDialog { DataContext = vm }; + vm.SubscribeDisposed(vm.commit_cmd.subscribe_executed(r => { + _model.save(r); + win.Close(); + })); return win; } }