openshot.code team mailing list archive

[Roman Yepishev <roman.yepishev@xxxxxxxxxxxxx>]

Roman Yepishev has proposed merging lp:~rye/openshot/stringify-none into lp:openshot.

Requested reviews:
  OpenShot Code (openshot.code)
Related bugs:
  Bug #900796 in OpenShot Video Editor: "when i run openshot i am able to import a file one time only."
  https://bugs.launchpad.net/openshot/+bug/900796

For more details, see:
https://code.launchpad.net/~rye/openshot/stringify-none/+merge/110771

Stringify None.

I guess it is better to have OpenShot store literal None but since all parameters are stored as strings I decided not to change the way it works.
-- 
https://code.launchpad.net/~rye/openshot/stringify-none/+merge/110771
Your team OpenShot Code is requested to review the proposed merge of lp:~rye/openshot/stringify-none into lp:openshot.

=== modified file 'openshot/windows/AddFiles.py'
--- openshot/windows/AddFiles.py	2012-04-10 20:12:04 +0000
+++ openshot/windows/AddFiles.py	2012-06-18 10:27:20 +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()