X-Git-Url: http://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2Fload%2FJpegLoader.java;h=194f2b7f08b83a09d2a11b72fb2ac4e48f77038c;hp=7939f1b0080310f28076c6dceff6b317e22d2644;hb=112bb0c9b46894adca9a33ed8c99ea712b253185;hpb=54b9d8bc8f0025ccf97a67d9dd217ef1f9cf082f

diff --git a/tim/prune/load/JpegLoader.java b/tim/prune/load/JpegLoader.java
index 7939f1b..194f2b7 100644
--- a/tim/prune/load/JpegLoader.java
+++ b/tim/prune/load/JpegLoader.java
@@ -92,8 +92,9 @@ public class JpegLoader implements Runnable
 			panel.add(_outsideAreaCheckbox);
 			_fileChooser.setAccessory(panel);
 			// start from directory in config if already set by other operations
-			File configDir = Config.getWorkingDirectory();
-			if (configDir != null) {_fileChooser.setCurrentDirectory(configDir);}
+			String configDir = Config.getConfigString(Config.KEY_PHOTO_DIR);
+			if (configDir == null) {configDir = Config.getConfigString(Config.KEY_TRACK_DIR);}
+			if (configDir != null) {_fileChooser.setCurrentDirectory(new File(configDir));}
 		}
 		// enable/disable track checkbox
 		_trackRectangle = inRectangle;
@@ -311,7 +312,8 @@ public class JpegLoader implements Runnable
 				{
 					// Store first directory in config for later
 					if (i == 0 && inFirstDir) {
-						Config.setWorkingDirectory(file.isDirectory()?file:file.getParentFile());
+						File workingDir = file.isDirectory()?file:file.getParentFile();
+						Config.setConfigString(Config.KEY_PHOTO_DIR, workingDir.getAbsolutePath());
 					}
 					// Check whether it's a file or a directory
 					if (file.isFile())