Merge pull request #2 from rampion/master

Two bugfixes from @rampion to fix exporting in OSX.
einaregilsson · Mar 30, 2012 · 87233b7 · 87233b7
2 parents 211b9c0 + ffc38e7
commit 87233b7
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/chrome/js/redirector-ui.js b/chrome/js/redirector-ui.js
@@ -70,6 +70,7 @@ function trPlural(name, count) {
 function getFile(captionKey, mode) {
 	var picker = new FilePicker(window, tr(captionKey), mode);
 	picker.defaultExtension = ".rjson";
+	picker.defaultString = "Redirector.rjson";
 	var dir = prefs.defaultDir;
 	if (dir) {
 		picker.displayDirectory = new LocalFile(dir);
@@ -79,7 +80,9 @@ function getFile(captionKey, mode) {
 	if (picker.show() == picker.returnCancel) {
 		return null;
 	}
-	prefs.defaultDir = picker.displayDirectory.path;
+	if (picker.displayDirectory) {
+		prefs.defaultDir = picker.displayDirectory.path;
+	}
 	return picker.file;
 }