openshot.code team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 566
fixes bug(s): https://launchpad.net/bugs/850292
committer: Andy Finch <we.rocked.in79@xxxxxxxxx>
branch nick: openshot
timestamp: Wed 2011-09-14 20:59:03 +0100
message:
  Fixed a bug that prevented files being imported after creating a folder in the project tree.
modified:
  openshot/classes/files.py


--
lp:openshot
https://code.launchpad.net/~openshot.code/openshot/main

Your team OpenShot Code is subscribed to branch lp:openshot.
To unsubscribe from this branch go to https://code.launchpad.net/~openshot.code/openshot/main/+edit-subscription

=== modified file 'openshot/classes/files.py'
--- openshot/classes/files.py	2011-09-08 20:40:59 +0000
+++ openshot/classes/files.py	2011-09-14 19:59:03 +0000
@@ -466,8 +466,10 @@
 		
 		# don't add a file that is alrady in this folder (i.e. dupe check)
 		for item in self.items:
-			if os.path.samefile(file_name, item.name):
-				return True
+			folder = self.FindFolder(item.name)
+			if not folder:
+				if os.path.samefile(file_name, item.name):
+					return True
 		
 		# didn't find a match
 		return False