From: Richard Heck <rgheck@lyx.org>
Date: Sat, 18 Jun 2016 16:59:02 +0000 (-0400)
Subject: Fix bug #10218, in a way less invasive than it has been fixed in
X-Git-Tag: 2.2.1~111
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b593ba5b48054b7c2b7108753b462427943660f5;p=features.git

Fix bug #10218, in a way less invasive than it has been fixed in
master. Patch due to Enrico.
---

diff --git a/lib/lyx2lyx/lyx_2_2.py b/lib/lyx2lyx/lyx_2_2.py
index 37a26be592..d969179652 100644
--- a/lib/lyx2lyx/lyx_2_2.py
+++ b/lib/lyx2lyx/lyx_2_2.py
@@ -1154,8 +1154,7 @@ def convert_origin(document):
             origin = document.dir.replace('\\', '/') + '/'
         else:
             origin = os.path.join("/systemlyxdir", relpath).replace('\\', '/') + '/'
-        if os.name != 'nt':
-            origin = unicode(origin, sys.getfilesystemencoding())
+        origin = unicode(origin, sys.getfilesystemencoding())
     document.header[i:i] = ["\\origin " + origin]