Timing related bug in BenchesDlg when editing database setting on startup fixed.

This commit is contained in:
Milan Hanajik
2018-01-25 10:41:20 +01:00
parent 7043e4e11e
commit caed4635eb
2 changed files with 4 additions and 5 deletions
+3 -3
View File
@@ -1,5 +1,5 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
///
using System;
using System.Windows.Forms;
@@ -175,8 +175,8 @@ namespace TBF
/// </summary>
private void okButton_Click(object sender, EventArgs e)
{
localSettings.Save();
Program.LocalSettings = LocalSettings.Load(Program.LocalSettingsFileName);
Program.LocalSettings.TestBenches = localSettings.TestBenches;
Program.LocalSettings.Save();
DialogResult = DialogResult.OK;
Close();
return;
+1 -2
View File
@@ -1,5 +1,5 @@
///
/// Copyright (c) 2013-2017 Sensus Metering Systems
/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
///
using System;
using System.IO;
@@ -360,7 +360,6 @@ namespace TBF
{
return; /// Exit program
}
Program.LocalSettings = LocalSettings.Load(Program.LocalSettingsFileName);
if (Program.LocalSettings == null)
return; /// Fatal error -> Exit program
else