[vlc-commits] don't add / if dir ="" (allows drive listing on windows)

Rob Jonson git at videolan.org
Fri Oct 14 00:27:29 CEST 2011


vlc | branch: master | Rob Jonson <rob at hobbyistsoftware.com> | Wed Sep 28 13:05:17 2011 +0100| [ce6a3a0e59c3ae1240e4877eb30e155b5f6edd36] | committer: Jean-Baptiste Kempf

don't add / if dir ="" (allows drive listing on windows)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ce6a3a0e59c3ae1240e4877eb30e155b5f6edd36
---

 share/lua/intf/modules/httprequests.lua |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/share/lua/intf/modules/httprequests.lua b/share/lua/intf/modules/httprequests.lua
index bbef569..a22e833 100644
--- a/share/lua/intf/modules/httprequests.lua
+++ b/share/lua/intf/modules/httprequests.lua
@@ -353,7 +353,11 @@ getbrowsetable = function ()
 
 	if dir then
 		if dir == "~" then dir = vlc.misc.homedir() end
-			dir = common.realpath(dir.."/")
+            -- FIXME: hack for Win32 drive list
+			if dir~="" then
+				dir = common.realpath(dir.."/")
+			end
+
 			local d = vlc.net.opendir(dir)
 			table.sort(d)
 



More information about the vlc-commits mailing list