aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2019-03-04 09:20:25 +0200
committerShlomo Hecht <shlomo@twine-s.com>2019-03-04 09:20:25 +0200
commit0b9ceb4bef00aae3c49271f8171d8acaba5455d6 (patch)
tree9b1092ccd88d42e0ebae68053f956d228527426a /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI
parent312cff53fcd1744f915a286332d2dd923e23d393 (diff)
parent6f3abda6cf8034ce4c18d39f82ce38c256ac2d34 (diff)
downloadTango-0b9ceb4bef00aae3c49271f8171d8acaba5455d6.tar.gz
Tango-0b9ceb4bef00aae3c49271f8171d8acaba5455d6.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
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())
{