Version 13, August 2011

[GpsPrune.git] / tim / prune / save / ExifSaver.java

diff --git a/tim/prune/save/ExifSaver.java b/tim/prune/save/ExifSaver.java
index 986a07ee3052eaa33e3d5ad6e2626f93ca282d34..020ef537ff4fa3f936c6e23cc1032bd0abb360ca 100644 (file)
--- a/tim/prune/save/ExifSaver.java
+++ b/tim/prune/save/ExifSaver.java
@@ -8,6 +8,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
 
+import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
@@ -129,7 +130,10 @@ public class ExifSaver implements Runnable
        {
                JPanel panel = new JPanel();
                panel.setLayout(new BorderLayout());
-               panel.add(new JLabel(I18nManager.getText("dialog.saveexif.intro")), BorderLayout.NORTH);
+               // Label at top
+               JLabel topLabel = new JLabel(I18nManager.getText("dialog.saveexif.intro"));
+               topLabel.setBorder(BorderFactory.createEmptyBorder(8, 6, 5, 6));
+               panel.add(topLabel, BorderLayout.NORTH);
                // centre panel with most controls
                JPanel centrePanel = new JPanel();
                centrePanel.setLayout(new BorderLayout());
@@ -292,6 +296,10 @@ public class ExifSaver implements Runnable
         */
        private boolean savePhoto(Photo inPhoto, boolean inOverwriteFlag, boolean inForceFlag)
        {
+               // If photos don't have a file, then can't save them
+               if (inPhoto.getFile() == null) {
+                       return false;
+               }
                // Check whether photo file still exists
                if (!inPhoto.getFile().exists())
                {