From ce5ad7e7f48751b25ef9dd377fbbface2adb30b4 Mon Sep 17 00:00:00 2001
From: Julius Härtl <jus@bitgrid.net>
Date: Tue, 23 May 2017 15:20:54 +0200
Subject: Prefer custom theme over theming app
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 core/js/mimetype.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/js')

diff --git a/core/js/mimetype.js b/core/js/mimetype.js
index 8920fe09a7e..ed4fedc7f8a 100644
--- a/core/js/mimetype.js
+++ b/core/js/mimetype.js
@@ -91,7 +91,7 @@ OC.MimeType = {
 				path += icon;
 			}
 		}
-		if(OCA.Theming) {
+		if(OCA.Theming && gotIcon === null) {
 			path = OC.generateUrl('/apps/theming/img/core/filetypes/');
 			path += OC.MimeType._getFile(mimeType, OC.MimeTypeList.files);
 			gotIcon = true;
-- 
cgit v1.2.3