From d5ec2cccf8272c5cbce670f3291e3bb3f81f436c Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Sat, 20 Aug 2016 23:09:34 +0200
Subject: [PATCH] [icons] don't show icons if icon theme is not valid id

---
 .../services/themes/electron-browser/themeService.ts  | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/services/themes/electron-browser/themeService.ts b/src/vs/workbench/services/themes/electron-browser/themeService.ts
index 7e6351e8637..ea208b595d7 100644
--- a/src/vs/workbench/services/themes/electron-browser/themeService.ts
+++ b/src/vs/workbench/services/themes/electron-browser/themeService.ts
@@ -404,19 +404,18 @@ export class ThemeService implements IThemeService {
 					iconSetData = <IInternalThemeData> iconSet;
 					break;
 				}
-				if (iconSet.id === DEFAULT_FILE_ICONS) {
-					iconSetData = <IInternalThemeData> iconSet;
-			}
 			}
-			if (iconSetData) {
 			return _applyFileIcons(iconSetData);
-			}
-			return false;
 		});
 	}
 }
 
 function _applyFileIcons(data: IInternalThemeData): TPromise<boolean> {
+	if (!data) {
+		_applyRules('', fileIconRulesClassName);
+		return TPromise.as(true);
+	}
+
 	if (data.styleSheetContent) {
 		_applyRules(data.styleSheetContent, fileIconRulesClassName);
 		return TPromise.as(true);
-- 
GitLab