michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Database upgrade bug fixes, ver. 2.26.1460

Browse Source
This commit is contained in:
Milan Hanajik 2020-05-11 09:05:38 +02:00
parent 435261831a
commit c1b9bf0c5f
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TBF/Program.cs
View File

@ -350,6 +350,8 @@ namespace TBF
/// Clone() guarantees that current bench settings wont be modified
/// when user modifies the database settings in DatabaseSettingsDlg.
Config.Data.CurrentBench = (Config.DatabaseSettings)LocalSettings.TestBenches[i].Clone();
Results.DB.DbType = Config.Data.CurrentBench.WaterMetersDBSettings.DbType;
Results.DB.ConnectionString = Config.Data.CurrentBench.WaterMetersDBSettings.ConnectionString;
/// Save the selection to local settings
LocalSettings.LastBenchName = Config.Data.CurrentBench.BenchName;
@ -367,8 +369,6 @@ namespace TBF
///
/// Connect to Results database and determine the last saved batch number.
///
Results.DB.DbType = Config.Data.CurrentBench.WaterMetersDBSettings.DbType;
Results.DB.ConnectionString = Config.Data.CurrentBench.WaterMetersDBSettings.ConnectionString;
Results.DB.LoadSharedData();
int maxBatchNr = Results.DB.GetMaxSavedBatchNr();
if (!Config.Data.CurrentBench.IsRealBench || Program.LocalSettings.BatchNr <= maxBatchNr)

4
TBF/Properties/AssemblyInfo.cs
View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.26.1458.0")]
[assembly: AssemblyFileVersion("2.26.1458.0")]
[assembly: AssemblyVersion("2.26.1460.0")]
[assembly: AssemblyFileVersion("2.26.1460.0")]

2
TBF/UI/MainWnd.cs
View File

@ -822,7 +822,7 @@ namespace TBF.UI
private void upgradeTSMenuItem_Click(object sender, EventArgs e)
{
new TBF.UI.Settings.UpgradeSelectionDlg().Show();
new TBF.UI.Settings.UpgradeSelectionDlg().ShowDialog();
}
private void iPerlHeadsToolStripMenuItem_Click(object sender, EventArgs e)