Changeset 8328 for trunk

Timestamp:

09/01/12 17:47:56 (5 months ago)

Author:

epruesse

Message:

fix: lib/arb_default/edit4.arb ignored
(extra code for edit4_rna.arb etc. always used full-paths,

but GB_open(...,'D') needs relative path)

Files:

• trunk/EDIT4/ED4_root.cxx (modified) (1 diff)

trunk/EDIT4/ED4_root.cxx

@@ -1866 +1866 @@
     char *propname = NULL;
 
-    for (int mode = 0; !propname && mode <= 2; ++mode) { // search for properties-database
+    // check if edit4_?na.arb / edit4_ali_???.arb exist in .arb_props
+    for (int mode = 0; !propname && mode <= 1; ++mode) { 
         const char *fullprop = GB_path_in_arbprop(ED4_propertyName(mode));
-        if (mode == 2 || GB_is_regularfile(fullprop)) {
+        if (GB_is_regularfile(fullprop)) {
             freedup(propname, fullprop);
         }
+    }
+
+    // if not, use 'mode 2', i.e. "edit4.arb"
+    // (no full path, we want to load default from arb_defaults)
+    if (!propname) {
+        freedup(propname, ED4_propertyName(2));
     }