updates for 0.9.4

[debian/openrocket] / src / net / sf / openrocket / gui / main / BasicFrame.java

diff --git a/src/net/sf/openrocket/gui/main/BasicFrame.java b/src/net/sf/openrocket/gui/main/BasicFrame.java
index f7777a0025c03cc306ef39355e832342deacdd77..c2d0d3367a62b866572745a181a118bf921a82e5 100644 (file)
--- a/src/net/sf/openrocket/gui/main/BasicFrame.java
+++ b/src/net/sf/openrocket/gui/main/BasicFrame.java
@@ -752,7 +752,7 @@ public class BasicFrame extends JFrame {
        
        
        
-       private static boolean open(URL url, Window parent) {
+       private static boolean open(URL url, BasicFrame parent) {
                String filename = null;
                
                // Try using URI.getPath();
@@ -780,7 +780,13 @@ public class BasicFrame extends JFrame {
                
                try {
                        InputStream is = url.openStream();
-                       open(is, filename, parent);
+                       if (open(is, filename, parent)) {
+                       // Close previous window if replacing
+                       if (parent.replaceable && parent.document.isSaved()) {
+                               parent.closeAction();
+                               parent.replaceable = false;
+                       }
+                       }
                } catch (IOException e) {
                        JOptionPane.showMessageDialog(parent, 
                                        "An error occurred while opening the file " + filename,