DYN-7015 ExecuteScriptFunctionAsync Crash Guard (#15311)

DynamoDS · Jun 13, 2024 · c613519 · c613519
1 parent 588a7b0
commit c613519
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/src/LibraryViewExtensionWebView2/LibraryViewController.cs b/src/LibraryViewExtensionWebView2/LibraryViewController.cs
@@ -485,17 +485,31 @@ private async void SetLibraryFontSize()
 
             if(fontSize != libraryFontSize)
             {
-                var result = await ExecuteScriptFunctionAsync(browser, "setLibraryFontSize", fontSize);
-                if(result != null)
-                    libraryFontSize = fontSize;
+                try
+                {
+                    var result = await ExecuteScriptFunctionAsync(browser, "setLibraryFontSize", fontSize);
+                    if (result != null)
+                        libraryFontSize = fontSize;
+                }
+                catch (Exception ex)
+                {
+                    LogToDynamoConsole("Error setting the font size: " + ex.Message);
+                }
             }
         }
 
         private async void SetTooltipText()
         {
             var jsonTooltipText = new { create = Resources.TooltipTextCreate, action = Resources.TooltipTextAction, query = Resources.TooltipTextQuery };
             var jsonString = JsonConvert.SerializeObject(jsonTooltipText);
-            var result = await ExecuteScriptFunctionAsync(browser, "setTooltipText", jsonString);
+            try
+            {
+                var result = await ExecuteScriptFunctionAsync(browser, "setTooltipText", jsonString);
+            }
+            catch (Exception ex)
+            {
+                LogToDynamoConsole("Error setting the tooltip text: " + ex.Message);
+            }
         }
 
         #region Tooltip
@@ -772,7 +786,7 @@ public static async Task<string> ExecuteScriptFunctionAsync(WebView2 webView2, s
         /// <param name="type"></param>
         internal void UpdateContext(string type)
         {
-            ExecuteScriptFunctionAsync(browser,"libController.setHostContext", type);
+            ExecuteScriptFunctionAsync(browser, "libController.setHostContext", type);
             ExecuteScriptFunctionAsync(browser, "replaceImages");
         }
     }

diff --git a/src/LibraryViewExtensionWebView2/ScriptingObject.cs b/src/LibraryViewExtensionWebView2/ScriptingObject.cs
@@ -101,7 +101,7 @@ internal void Notify(string dataFromjs)
                     var searchStream = controller.searchResultDataProvider.GetResource(data, out extension);
                     var searchReader = new StreamReader(searchStream);
                     var results = searchReader.ReadToEnd();
-                    //send back results to libjs
+                    //send back results to librarie.js
                     LibraryViewController.ExecuteScriptFunctionAsync(controller.browser, "completeSearch", results);
                     searchReader.Dispose();
                 }