Merge branch 'develop' into plugins

JKatzwinkel · Jun 26, 2015 · 4fa6ee3 · 4fa6ee3
2 parents 0890dd4 + f28761c
commit 4fa6ee3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/mps_youtube/config.py b/mps_youtube/config.py
@@ -257,7 +257,12 @@ def check_player(player):
             return dict(valid=True, message=msg, value=player)
 
     else:
-        if mswin and not player.endswith(".exe"):
+        if mswin and not (player.endswith(".exe") or player.endswith(".com")):
+            # Using mpv.exe has issues; use mpv.com
+            if "mpv" in player:
+                retval = check_player(player + ".com")
+                if retval["valid"]:
+                    return retval
             return check_player(player + ".exe")
 
         else:

diff --git a/mps_youtube/main.py b/mps_youtube/main.py
@@ -328,7 +328,7 @@ def process_cl_args():
     if args.no_preload:
         g.preload_disabled = True
 
-    g.arument_commands = args.commands
+    g.argument_commands = args.commands
 
 
 def init():

diff --git a/mps_youtube/util.py b/mps_youtube/util.py
@@ -88,7 +88,7 @@ def xenc(stuff):
         return utf8_replace(stuff) if not_utf8_environment else stuff
 
     else:
-        return stuff.encode("utf8", errors="replace")
+        return stuff.encode("utf8", errors="replace").decode()
 
 
 def xprint(stuff, end=None):