Merge pull request #230 from tonyhallett/fix-invokescript-unknown-name

wrap invokeScript in try/catch
FortuneN · Feb 15, 2022 · 6a2822c · 6a2822c
2 parents 1571c6c + 225034b
commit 6a2822c
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/SharedProject/Output/OutputToolWindowControl.xaml.cs b/SharedProject/Output/OutputToolWindowControl.xaml.cs
@@ -102,9 +102,8 @@ public OutputToolWindowControl(ScriptManager scriptManager,IFCCEngine fccEngine)
 				});
 			};
 
-
             this.fccEngine = fccEngine;
-        }
+		}
 
         protected override void OnDpiChanged(DpiScale oldDpi, DpiScale newDpi)
 		{
@@ -114,23 +113,27 @@ protected override void OnDpiChanged(DpiScale oldDpi, DpiScale newDpi)
 
 		private void OutputToolWindowControl_Loaded(object sender, RoutedEventArgs e)
         {
-            if (!hasLoaded)
-            {
-				if(FCCOutputBrowser.Document == null)
-                {
-					fccEngine.ReadyForReport();
-				}
-
-				hasLoaded = true;
+			if (!hasLoaded)
+			{
+				fccEngine.ReadyForReport();
 				FCCOutputBrowser.Visibility = Visibility.Visible;
-            }
+				hasLoaded = false;
+			}
         }
 
         public object InvokeScript(string scriptName, params object[] args)
         {
 			if (FCCOutputBrowser.Document != null)
 			{
-				return FCCOutputBrowser.InvokeScript(scriptName, args);
+				try
+				{
+					// Can use FCCOutputBrowser.IsLoaded but 
+					// it is possible for this to be successful when IsLoaded false.
+					return FCCOutputBrowser.InvokeScript(scriptName, args);
+				}
+				catch { 
+					// todo what to do about missed 
+				}
 			}
             return null;
 		}