Handling connected to "wrong" environtment works nicer now

rappen · May 12, 2022 · bfbc5df · bfbc5df
1 parent 98f6379
commit bfbc5df
Showing 1 changed file with 19 additions and 3 deletions.
diff --git a/FetchXmlBuilder/FXBMetadata.cs b/FetchXmlBuilder/FXBMetadata.cs
@@ -8,6 +8,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.ServiceModel;
 using System.Windows.Forms;
 using XrmToolBox.Extensibility;
 
@@ -362,8 +363,20 @@ private void LoadEntityDetailsCompleted(string entityName, EntityMetadata Result
         {
             if (Error != null)
             {
-                entityShitList.Add(entityName);
-                ShowErrorDialog(Error, "Load attribute metadata");
+                if (!entityShitList.Contains(entityName))
+                {
+                    entityShitList.Add(entityName);
+                }
+                if (Error is FaultException<OrganizationServiceFault> srcexc &&
+                    srcexc.Detail is OrganizationServiceFault orgerr &&
+                    orgerr.ErrorCode == -2147220969)
+                {
+                    SendMessageToStatusBar(this, new XrmToolBox.Extensibility.Args.StatusBarMessageEventArgs($"Entity {entityName} not found in the database."));
+                }
+                else
+                {
+                    ShowErrorDialog(Error, "Load attribute metadata");
+                }
             }
             else
             {
@@ -381,7 +394,10 @@ private void LoadEntityDetailsCompleted(string entityName, EntityMetadata Result
                 }
                 else
                 {
-                    entityShitList.Add(entityName);
+                    if (!entityShitList.Contains(entityName))
+                    {
+                        entityShitList.Add(entityName);
+                    }
                     MessageBox.Show("Metadata not found for entity " + entityName, "Load attribute metadata", MessageBoxButtons.OK, MessageBoxIcon.Warning);
                 }
                 working = false;