Version 8, September 2009

[GpsPrune.git] / tim / prune / load / JpegLoader.java

diff --git a/tim/prune/load/JpegLoader.java b/tim/prune/load/JpegLoader.java
index 7939f1b0080310f28076c6dceff6b317e22d2644..194f2b7f08b83a09d2a11b72fb2ac4e48f77038c 100644 (file)
--- 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())