Changeset 98 for trunk/src/org/expeditee/gui/FrameIO.java

Timestamp:

06/10/08 15:01:27 (16 years ago)

Author:

ra33

Message:

Fixed a couple of minor bugs that popped up in the demo

File:

• trunk/src/org/expeditee/gui/FrameIO.java (modified) (2 diffs)

trunk/src/org/expeditee/gui/FrameIO.java

@@ -1033 +1033 @@
                 SuspendCache();
                 // copy the default .0 and .1 files
-                Frame base;
+                Frame base = null;
                 try {
                         base = LoadFrame(UserSettings.DefaultFrame);
                 } catch (Exception e) {
+                }
+                // The frame may not be accessed for various reasons... in all these
+                // cases just create a new one
+                if (base == null) {
                         base = new Frame();
                 }
+
                 ResumeCache();
 
@@ -1114 +1119 @@
                                         dest = new File(destPath + ++copyNumber + File.separator);
                                 }
-                                return framesetDirectory.renameTo(dest);
+                                if (!framesetDirectory.renameTo(dest)) {
+                                        for (File f : framesetDirectory.listFiles()) {
+                                                if (!f.delete())
+                                                        return false;
+                                        }
+                                        if (!framesetDirectory.delete())
+                                                return false;
+                                }
+                                return true;
                         }
                 }