Merge pull request #1071 from medlir/fix-browser-bookmarks-plugin-exception

jjw24 · web-flow · commit 749e7ff618be · 2022-03-10T06:14:55.000+11:00
avoid exception in ChromiumBookmarkLoader.cs
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromiumBookmarkLoader.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromiumBookmarkLoader.cs
@@ -37,7 +37,8 @@ protected List<Bookmark> LoadBookmarksFromFile(string path, string source)
                 return new();
             foreach (var folder in rootElement.EnumerateObject())
             {
-                EnumerateFolderBookmark(folder.Value, bookmarks, source);
+                if (folder.Value.ValueKind == JsonValueKind.Object)
+                    EnumerateFolderBookmark(folder.Value, bookmarks, source);
             }
             return bookmarks;
         }
@@ -64,4 +65,4 @@ private void EnumerateFolderBookmark(JsonElement folderElement, List<Bookmark> b
 
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,8 @@ protected List<Bookmark> LoadBookmarksFromFile(string path, string source)`
`37`	`37`	`return new();`
`38`	`38`	`foreach (var folder in rootElement.EnumerateObject())`
`39`	`39`	`{`
`40`		`- EnumerateFolderBookmark(folder.Value, bookmarks, source);`
	`40`	`+ if (folder.Value.ValueKind == JsonValueKind.Object)`
	`41`	`+ EnumerateFolderBookmark(folder.Value, bookmarks, source);`
`41`	`42`	`}`
`42`	`43`	`return bookmarks;`
`43`	`44`	`}`
`@@ -64,4 +65,4 @@ private void EnumerateFolderBookmark(JsonElement folderElement, List<Bookmark> b`
`64`	`65`
`65`	`66`	`}`
`66`	`67`	`}`
`67`		`-}`
	`68`	`+}`