work around crash with external inset and latex export

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5514 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 34aa1964f3614baed1ac58c7beb9942b361a848f..b475fec8cd0925767bbbe610909de5e42287ab7d 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-24  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * insetexternal.C (doSubstitution): change order of substitution
+       to work around ReplaceEnvironmentPath brokenness
+
 2002-10-24  Rob Lahaye  <lahaye@snu.ac.kr>
 
        * insetgraphicsParams.h (scale): is now a float, not an unsigned int.

diff --git a/src/insets/insetexternal.C b/src/insets/insetexternal.C
index cef318c709f98df06d68ce6a03b0aab5500dd4e1..33f26e05b50f4377bfed6d9ecd2897367947e0f4 100644 (file)
--- a/src/insets/insetexternal.C
+++ b/src/insets/insetexternal.C
@@ -243,9 +243,9 @@ string const InsetExternal::doSubstitution(Buffer const * buffer,
        result = subst(result, "$$Basename", basename);
        result = subst(result, "$$Parameters", params_.parameters);
        result = subst(result, "$$FPath", filepath);
-       result = ReplaceEnvironmentPath(result);
        result = subst(result, "$$Tempname", tempname_);
        result = subst(result, "$$Sysdir", system_lyxdir);
+       result = ReplaceEnvironmentPath(result);
 
        // Handle the $$Contents(filename) syntax
        if (contains(result, "$$Contents(\"")) {