Fix for #3092: allow copying of user settings to the system config if the user profil...

diff --git a/source/config/__init__.py b/source/config/__init__.py
index da5b615..16fbdd7 100644 (file)
--- a/source/config/__init__.py
+++ b/source/config/__init__.py
@@ -392,7 +392,7 @@ def setSystemConfigToCurrentConfig():
 \r
 def _setSystemConfig(fromPath):\r
        import installer\r
-       toPath=os.path.join(sys.prefix,'systemConfig')\r
+       toPath=os.path.join(sys.prefix.decode('mbcs'),'systemConfig')\r
        if os.path.isdir(toPath):\r
                installer.tryRemoveFile(toPath)\r
        for curSourceDir,subDirs,files in os.walk(fromPath):\r

diff --git a/source/nvda_slave.pyw b/source/nvda_slave.pyw
index b3eae49..c7810c2 100755 (executable)
--- a/source/nvda_slave.pyw
+++ b/source/nvda_slave.pyw
@@ -40,7 +40,7 @@ def main():
                                None,winUser.SW_SHOWNORMAL)\r
                elif action=="setNvdaSystemConfig":\r
                        import config\r
-                       config._setSystemConfig(args[0])\r
+                       config._setSystemConfig(args[0].decode('mbcs'))\r
                elif action == "config_setStartOnLogonScreen":\r
                        enable = bool(int(args[0]))\r
                        import config\r

diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
index 3afcc16..628e8e4 100644 (file)
--- a/user_docs/en/changes.t2t
+++ b/user_docs/en/changes.t2t
@@ -79,6 +79,7 @@ Please see the [Commands Quick Reference keyCommands.html] document for the new
 - In applications using the Java Access Bridge, braille displays are now updated correctly when the caret moves in editable text fields . (#3107)\r
 - Support the form landmark in browse mode documents that support landmarks. (#2997) \r
 - The eSpeak synth driver now handles reading by character more appropriately (e.g. announcing a letter's name or value rather than just its sound or generic name). (#3106)\r
+- NVDA no longer fails to copy user settings for use on logon and other secure screens, when the user's profile path contains non-ascii characters. (#3092)\r
 \r
 \r
 == Changes for Developers ==\r