Merge pull request #12 from DiMartinoXBMC/master

# fix
pull/16/merge
inpos 2016-04-07 22:44:04 +04:00
commit 86733ee507
2 changed files with 2 additions and 2 deletions

View File

@ -1115,7 +1115,7 @@ class Core:
else: else:
url = '%s?action=%s&url=%s' % (sys.argv[0], action, urllib.quote_plus(link)) url = '%s?action=%s&url=%s' % (sys.argv[0], action, urllib.quote_plus(link))
if action2: if action2:
url = url + '&url2=%s' % urllib.quote_plus(action2) url = url + '&url2=%s' % urllib.quote_plus(ensure_str(action2))
if not contextMenu: if not contextMenu:
contextMenu = [(self.localize('Search Control Window'), contextMenu = [(self.localize('Search Control Window'),
'xbmc.RunScript(%s,)' % os.path.join(ROOT, 'controlcenter.py'))] 'xbmc.RunScript(%s,)' % os.path.join(ROOT, 'controlcenter.py'))]

View File

@ -447,7 +447,7 @@ def cutFolder(contentList, tdir=None):
elif not tdir: elif not tdir:
contentListNew.append(item) contentListNew.append(item)
if tdir and dir == tdir: if tdir and ensure_str(dir) == ensure_str(tdir):
tupleContent = list(item) tupleContent = list(item)
tupleContent[0] = item[0][len(dir) + 1:] tupleContent[0] = item[0][len(dir) + 1:]
contentListNew.append(list(tupleContent)) contentListNew.append(list(tupleContent))