Merge pull request #12577 from nvaccess/beta

Merge beta back to master

source/core.py

@@ -133,8 +133,12 @@ def restartUnsafely():
  - Remove icons (systray)
  - Saving settings
  """
-
+ log.info("Restarting unsafely")
  import subprocess
+ # Unlike a normal restart, see L{restart}:
+ # - if addons are disabled, leave them disabled
+ # - if debug logging is set, leave it set.
+ # The new instance should operate in the same way (as much as possible) as the old instance.
  for paramToRemove in ("--ease-of-access"):
  try:
  sys.argv.remove(paramToRemove)

source/gui/installerGui.py

@@ -114,7 +114,6 @@ def doInstall(
  if startAfterInstall:
  newNVDA = core.NewNVDAInstance(
  filePath=os.path.join(installer.defaultInstallPath, 'nvda.exe'),
- parameters=f"--log-level={log.level}"
  )
  if not core.triggerNVDAExit(newNVDA):
  log.error("NVDA already in process of exiting, this indicates a logic error.")
@@ -473,7 +472,6 @@ def doCreatePortable(portableDirectory,copyUserConfig=False,silent=False,startAf
  if startAfterCreate:
  newNVDA = core.NewNVDAInstance(
  filePath=os.path.join(portableDirectory, 'nvda.exe'),
- parameters=f"--log-level={log.level}"
  )
  if not core.triggerNVDAExit(newNVDA):
  log.error("NVDA already in process of exiting, this indicates a logic error.")

source/updateCheck.py

@@ -220,7 +220,6 @@ def _executeUpdate(destPath):
  )
  else:
  executeParams = u"--launcher"
- executeParams += f"--log-level={log.level}"
  # #4475: ensure that the new process shows its first window, by providing SW_SHOWNORMAL
  if not core.triggerNVDAExit(core.NewNVDAInstance(destPath, executeParams)):
  log.error("NVDA already in process of exiting, this indicates a logic error.")