openshot.code team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 681
fixes bug: https://launchpad.net/bugs/900796
committer: Andy Finch <we.rocked.in79@xxxxxxxxx>
branch nick: openshot
timestamp: Tue 2012-08-21 22:16:33 +0100
message:
  Fixed a crash when setting last used import folder when adding files from Recently Used folder. Thanks to Roman Yepishev for the patch.
modified:
  openshot/windows/AddFiles.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/windows/AddFiles.py'
--- openshot/windows/AddFiles.py	2012-04-10 20:12:04 +0000
+++ openshot/windows/AddFiles.py	2012-08-21 21:16:33 +0000
@@ -117,7 +117,10 @@
 			messagebox.show(_("Error"), _("There was an error importing the selected file(s)."))
 
 		#set the last used folder
-		preferences.Settings.app_state["import_folder"] = self.frmAddFiles.get_current_folder()
+		current_folder = self.frmAddFiles.get_current_folder()
+		if current_folder is None:
+			current_folder = "None"
+		preferences.Settings.app_state["import_folder"] = current_folder
 		
 		# clear and destroy this dialog
 		self.form.import_files_dialog = None	
@@ -164,7 +167,10 @@
 			messagebox.show(_("Error"), _("There was an error importing the selected file(s)."))
 
 		#set the last used folder
-		preferences.Settings.app_state["import_folder"] = self.frmAddFiles.get_current_folder()
+		current_folder = self.frmAddFiles.get_current_folder()
+		if current_folder is None:
+			current_folder = "None"
+		preferences.Settings.app_state["import_folder"] = current_folder
 		
 			
 		self.frmAddFiles.destroy()