openshot.code team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 614
fixes bug: https://launchpad.net/bugs/912981
committer: Andy Finch <we.rocked.in79@xxxxxxxxx>
branch nick: openshot
timestamp: Sat 2012-01-07 13:31:55 +0000
message:
  Fixed a bug that prevented files being imported if a project was loaded that contained missing files on disk.
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-12-11 21:38:46 +0000
+++ openshot/classes/files.py	2012-01-07 13:31:55 +0000
@@ -477,8 +477,12 @@
 			
 			if isinstance(item, OpenShotFile):
 				if item.file_type != "image sequence":
-					if os.path.samefile(file_name, item.name):
-						return True
+					try:
+						if os.path.samefile(file_name, item.name):
+							return True
+					except OSError:
+						print "Error checking files on import"
+						
 		
 		# didn't find a match
 		return False