Apply app icons only to app items

oliverschwendener · Nov 29, 2018 · a412823 · a412823
1 parent 3768f51
commit a412823
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/ts/main.ts b/src/ts/main.ts
@@ -324,11 +324,20 @@ ipcMain.on(IpcChannels.getSearch, (event: Electron.Event, userInput: string): vo
     if (config.useNativeIcons) {
         const result = inputValidationService.getSearchResult(userInput);
         const iconService = new AppIconService(appIconStore);
-        const promises = result.map((r) => iconService.getProgramIcon(config.iconSet, r));
+        const promises = result
+            .filter((r) => r.icon === config.iconSet.appIcon)
+            .map((r) => iconService.getProgramIcon(config.iconSet, r));
+
+        Promise.all(promises).then((resultsWithIcon: SearchResultItem[]) => {
+            for (const resultWithIcon of resultsWithIcon) {
+                const resultItem = result.find((r) => r.executionArgument === resultWithIcon.executionArgument && r.icon === config.iconSet.appIcon);
+                if (resultItem !== undefined) {
+                    resultItem.icon = resultWithIcon.icon;
+                }
+            }
 
-        Promise.all(promises).then((searchResults: SearchResultItem[]) => {
             updateWindowSize(result.length);
-            event.sender.send(IpcChannels.getSearchResponse, searchResults);
+            event.sender.send(IpcChannels.getSearchResponse, result);
         });
     } else {
         const result = inputValidationService.getSearchResult(userInput);