JAL-3247 JAL-3254 Getdown now opening any files thrown at it by a file-association...

[jalview.git] / getdown / src / getdown / launcher / src / main / java / com / threerings / getdown / launcher / Getdown.java

diff --git a/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java b/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java
index 7269c85..f87382a 100644 (file)
--- a/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java
+++ b/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java
@@ -1054,15 +1054,6 @@ public abstract class Getdown extends Thread
           if (j > -1) {
             ext = filename.substring(j+1);
           }
-          // jvp files etc
-          boolean addedStartupFile = false; // only add one startup file
-          if (_app.startupFileExtensions.contains(ext.toLowerCase()) && ! addedStartupFile) {
-            File f = new File(filename);
-            if (f.exists()) {
-              _app.addStartupFile(f);
-              addedStartupFile = true;
-            }
-          }
           // jvl files
           if (_app.locatorFileExtension.equals(ext.toLowerCase())) {
             // Do something special with this here
@@ -1088,6 +1079,16 @@ public abstract class Getdown extends Thread
                 }
               }
             }
+          } else {
+            // jvp files etc
+            boolean addedStartupFile = false; // only add one startup file
+            if (! addedStartupFile) {
+              File f = new File(filename);
+              if (f.exists()) {
+                _app.addStartupFile(f);
+                addedStartupFile = true;
+              }
+            }
           }
         }
       }