Merge pull request #12 from DiMartinoXBMC/master

# fix

Core.py

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

functions.py

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