aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2019-03-06 13:27:36 +0200
committerShlomo Hecht <shlomo@twine-s.com>2019-03-06 13:27:36 +0200
commitd95329065734fec34e0e3763cf4b6dee428499d2 (patch)
treebfdb162ff3d9126e0223ba3c8df6057559569a0f /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI
parentb3cfecea7d2493776db2f03ee48b06436029d438 (diff)
parente779c5128f45ccf3e45fbe304da496d4b2f89cb4 (diff)
downloadTango-d95329065734fec34e0e3763cf4b6dee428499d2.tar.gz
Tango-d95329065734fec34e0e3763cf4b6dee428499d2.zip
merge
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI')
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs10
1 files changed, 9 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs
index d6fb50a8c..7aa9ae890 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs
@@ -84,7 +84,15 @@ namespace Tango.MachineStudio.UI.Authentication
ObservablesContext.OverrideSettingsDataSource(response.DataSource);
}
- ObservablesStaticCollections.Instance.Initialize();
+ try
+ {
+ ObservablesStaticCollections.Instance.Initialize();
+ }
+ catch (System.Data.Entity.Core.MetadataException)
+ {
+ ObservablesContext.ClearModelStore();
+ ObservablesStaticCollections.Instance.Initialize();
+ }
using (ObservablesContext db = ObservablesContext.CreateDefault())
{