Merged main

diff --cc sconstruct
index ece2ca0,ae64b49..9acf60a
--- 1/sconstruct
--- 2/sconstruct
+++ b/sconstruct
@@@ -306,5 -322,4 +311,5 @@@ symbolsList.extend(env.Glob(os.path.joi
  symbolsArchive = env.SzArchive(outputDir.File("%s_debugSymbols.zip" % outFilePrefix), symbolsList)\r
  env.Alias("symbolsArchive", symbolsArchive)\r
  \r
- env.Default(dist)\r
+ env.Default(portableDist)\r
 +\r

diff --cc source/config/__init__.py
Simple merge

diff --cc source/core.py
index 0de56b6,322691c..9024cd6
--- 1/source/core.py
--- 2/source/core.py
+++ b/source/core.py
@@@ -87,14 -87,12 +87,17 @@@ def doStartupDialogs()
  \r
  def restart():\r
        """Restarts NVDA by starting a new copy with -r."""\r
 +      if globalVars.appArgs.launcher:\r
 +              import wx\r
 +              globalVars.exitCode=2\r
 +              wx.GetApp().ExitMainLoop()\r
 +              return\r
        import subprocess\r
        import shellapi\r
-       shellapi.ShellExecute(None,None,unicode(sys.executable),unicode(subprocess.list2cmdline(sys.argv+['-r'])),None,0)\r
+       shellapi.ShellExecute(None, None,\r
+               sys.executable.decode("mbcs"),\r
+               subprocess.list2cmdline(sys.argv + ["-r"]).decode("mbcs"),\r
+               None, 0)\r
  \r
  def resetConfiguration():\r
        """Loads the configuration, installs the correct language support and initialises audio so that it will use the configured synth and speech settings.\r