Two bugfixes that appear after Reset Windows

rappen · Nov 22, 2022 · f19f790 · f19f790
1 parent c306df3
commit f19f790
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/FetchXmlBuilder/DockControls/ResultGrid.cs b/FetchXmlBuilder/DockControls/ResultGrid.cs
@@ -4,7 +4,6 @@
 using Rappen.XTB.FetchXmlBuilder.Extensions;
 using Rappen.XTB.FetchXmlBuilder.Views;
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
 
@@ -146,7 +145,9 @@ internal void SetLayoutToGrid()
 
         private void GetLayoutFromGrid()
         {
-            if (!form.settings.Results.WorkWithLayout || !(form.dockControlBuilder.RootEntityMetadata is EntityMetadata entity))
+            if (!form.settings.Results.WorkWithLayout ||
+                !(form.dockControlBuilder.RootEntityMetadata is EntityMetadata entity) ||
+                crmGridView1.DataSource == null)
             {
                 return;
             }

diff --git a/FetchXmlBuilder/DockControls/XmlContentControl.cs b/FetchXmlBuilder/DockControls/XmlContentControl.cs
@@ -146,13 +146,16 @@ private void XmlContentDisplayDialog_KeyDown(object sender, KeyEventArgs e)
 
         public void UpdateXML(string xmlString)
         {
-            if (txtXML.Lexer == ScintillaNET.Lexer.Xml)
+            if (Visible)
             {
-                FormatXML(xmlString, true);
-            }
-            else
-            {
-                txtXML.Text = xmlString;
+                if (txtXML.Lexer == ScintillaNET.Lexer.Xml)
+                {
+                    FormatXML(xmlString, true);
+                }
+                else
+                {
+                    txtXML.Text = xmlString;
+                }
             }
             liveUpdateXml = xmlString;
         }