git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.opendreambox.org:/git/enigma2
[enigma2.git]
/
lib
/
python
/
Plugins
/
Extensions
/
MediaPlayer
/
plugin.py
diff --git
a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
index 485dfe32a612920149a558bbccf4fc103a7d1671..3e02384122a8826c0f9f820abf57017f1ddee89f 100644
(file)
--- a/
lib/python/Plugins/Extensions/MediaPlayer/plugin.py
+++ b/
lib/python/Plugins/Extensions/MediaPlayer/plugin.py
@@
-659,12
+659,16
@@
class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB
def copyDirectory(self, directory, recursive = True):
print "copyDirectory", directory
def copyDirectory(self, directory, recursive = True):
print "copyDirectory", directory
- filelist = FileList(directory, useServiceRef = True, isTop = True)
+ if directory == '/':
+ print "refusing to operate on /"
+ return
+ filelist = FileList(directory, useServiceRef = True, showMountpoints = False, isTop = True)
for x in filelist.getFileList():
if x[0][1] == True: #isDir
if recursive:
for x in filelist.getFileList():
if x[0][1] == True: #isDir
if recursive:
- self.copyDirectory(x[0][0])
+ if x[0][0] != directory:
+ self.copyDirectory(x[0][0])
elif filelist.getServiceRef() and filelist.getServiceRef().type == 4097:
self.playlist.addFile(x[0][0])
self.playlist.updateList()
elif filelist.getServiceRef() and filelist.getServiceRef().type == 4097:
self.playlist.addFile(x[0][0])
self.playlist.updateList()