Merge pull request #100 from jjw24/fix_merge_bug_folderplugin

jjw24 · web-flow · commit e66b64650d14 · 2019-12-13T07:41:09.000+11:00
Fix merge bug in Folder plugin
diff --git a/Plugins/Wox.Plugin.Folder/Main.cs b/Plugins/Wox.Plugin.Folder/Main.cs
@@ -165,8 +165,7 @@ private List<Result> QueryInternal_Directory_Exists(Query query)
                 searchOption = SearchOption.AllDirectories;
                 incompleteName = incompleteName.Substring(1);
             }
-
-            string searchNickname = new FolderLink { Path = query.Search }.Nickname;
+            
             try
             {
                 // search folder and add results

Original file line number	Diff line number	Diff line change
`@@ -165,8 +165,7 @@ private List<Result> QueryInternal_Directory_Exists(Query query)`
`165`	`165`	`searchOption = SearchOption.AllDirectories;`
`166`	`166`	`incompleteName = incompleteName.Substring(1);`
`167`	`167`	`}`
`168`		`-`
`169`		`- string searchNickname = new FolderLink { Path = query.Search }.Nickname;`
	`168`	`+`
`170`	`169`	`try`
`171`	`170`	`{`
`172`	`171`	`// search folder and add results`