Merge branch 'master' of http://git.sysphere.org/vicious

2011-05-09 18:40:08 +02:00 · 2011-05-09 18:40:08 +02:00 · 80da3d6b40
parent bd5337e81c 06e8f7c68a
commit 80da3d6b40
1 changed files with 3 additions and 3 deletions
--- a/widgets/mpd.lua
+++ b/widgets/mpd.lua
@ -30,9 +30,9 @@ local function worker(format, warg)
    }

    -- Fallback to MPD defaults
-    local pass = warg and warg[1] or "\"\""
-    local host = warg and warg[2] or "127.0.0.1"
-    local port = warg and warg[3] or "6600"
+    local pass = warg and (warg.password or warg[1]) or "\"\""
+    local host = warg and (warg.host or warg[2]) or "127.0.0.1"
+    local port = warg and (warg.port or warg[3]) or "6600"

    -- Construct MPD client options
    local mpdh = "telnet://"..host..":"..port