From 265768ecfcddb1a236d40955fb2522f017db5508 Mon Sep 17 00:00:00 2001 From: tomkat83 Date: Tue, 5 Apr 2016 12:02:15 +0200 Subject: [PATCH] Revert "Merge remote-tracking branch 'doctorlard/master' into develop" This reverts commit 248ae52599f96f5ee4dda071d4da3498d48478d8, reversing changes made to fb46c41294961f641cb7c7763c8d79f3a68e2262. --- resources/lib/entrypoint.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/lib/entrypoint.py b/resources/lib/entrypoint.py index 9df735b7..9253d688 100644 --- a/resources/lib/entrypoint.py +++ b/resources/lib/entrypoint.py @@ -768,8 +768,7 @@ def BrowseContent(viewname, type="", folderid=""): if view.get("name") == viewname.decode('utf-8'): folderid = view.get("id") - if viewname is not None: - utils.logMsg("BrowseContent","viewname: %s - type: %s - folderid: %s - filter: %s" %(viewname.decode('utf-8'), type.decode('utf-8'), folderid.decode('utf-8'), filter.decode('utf-8'))) + utils.logMsg("BrowseContent","viewname: %s - type: %s - folderid: %s - filter: %s" %(viewname.decode('utf-8'), type.decode('utf-8'), folderid.decode('utf-8'), filter.decode('utf-8'))) #set the correct params for the content type #only proceed if we have a folderid if folderid: @@ -938,9 +937,10 @@ def BrowseChannels(itemid, folderid=None): itemid = item['Id'] itemtype = item['Type'] li = createListItemFromEmbyItem(item,art,doUtils) - - isFolder = item.get('IsFolder', False) - + if itemtype == "ChannelFolderItem": + isFolder = True + else: + isFolder = False channelId = item.get('ChannelId', "") channelName = item.get('ChannelName', "") if itemtype == "Channel":