diff --git a/RFiDGear/App.xaml b/RFiDGear/App.xaml index ff0c833..ae5c748 100644 --- a/RFiDGear/App.xaml +++ b/RFiDGear/App.xaml @@ -20,7 +20,7 @@ - + diff --git a/RFiDGear/DataAccessLayer/Remote/FromFile/ReportReaderWriter.cs b/RFiDGear/DataAccessLayer/Remote/FromFile/ReportReaderWriter.cs index f97079f..6b1bb06 100644 --- a/RFiDGear/DataAccessLayer/Remote/FromFile/ReportReaderWriter.cs +++ b/RFiDGear/DataAccessLayer/Remote/FromFile/ReportReaderWriter.cs @@ -1,13 +1,8 @@ using iText.Forms; using iText.Forms.Fields; -using iText.IO.Source; -using iText.Kernel.Geom; using iText.Kernel.Pdf; using iText.Kernel.Colors; -using RFiDGear.Model; -using RFiDGear.ViewModel; - using Log4CSharp; using System; @@ -15,9 +10,7 @@ using System.Collections.Generic; using System.IO; using System.Reflection; -using System.Text; using System.Xml; -using System.Xml.Serialization; namespace RFiDGear.DataAccessLayer { diff --git a/RFiDGear/ViewModel/MainWindowViewModel.cs b/RFiDGear/ViewModel/MainWindowViewModel.cs index 22d8a05..3a02be5 100644 --- a/RFiDGear/ViewModel/MainWindowViewModel.cs +++ b/RFiDGear/ViewModel/MainWindowViewModel.cs @@ -119,11 +119,6 @@ public MainWindowViewModel() culture = (settings.DefaultSpecification.DefaultLanguage == "german") ? new CultureInfo("de-DE") : new CultureInfo("en-US"); autoLoadLastUsedDB = settings.DefaultSpecification.AutoLoadProjectOnStart; - - if (settings.DefaultSpecification.AutoCheckForUpdates) - { - updater?.StartMonitoring(); - } } triggerReadChip = new DispatcherTimer @@ -2147,6 +2142,14 @@ private void LoadCompleted(object sender, EventArgs e) { LogWriter.CreateLogEntry(string.Format("{0}: {1}; {2}", DateTime.Now, ex.Message, ex.InnerException != null ? ex.InnerException.Message : ""), FacilityName); } + + using (SettingsReaderWriter settings = new SettingsReaderWriter()) + { + if (settings.DefaultSpecification.AutoCheckForUpdates) + { + updater?.StartMonitoring(); + } + } } if (updateAvailable) diff --git a/Setup/Product.wxs b/Setup/Product.wxs index b58797d..6d0535c 100644 --- a/Setup/Product.wxs +++ b/Setup/Product.wxs @@ -198,15 +198,9 @@ - - + + - - - - - - @@ -276,10 +270,12 @@ - + + + @@ -298,7 +294,12 @@ - + + + + + + @@ -306,9 +307,6 @@ - - - @@ -340,17 +338,14 @@ - - - - - + + - - + + - - + + @@ -391,15 +386,14 @@ + - + + - - - @@ -421,29 +415,23 @@ - - - + - + + - - + - - - - @@ -456,6 +444,9 @@ + + +