Merge d7aea3b into fc6b73f

seanbudd · web-flow · commit bd474b6be671 · 2021-03-23T11:43:13.000+10:00
diff --git a/appveyor.yml b/appveyor.yml
@@ -146,6 +146,12 @@ before_test:
       Add-AppveyorMessage "Unable to install NVDA prior to tests."
      }
      Push-AppveyorArtifact $installerLogFilePath
+     $crashDump = "$outputDir\nvda_crash.dmp"
+     if (Test-Path -Path $crashDump){
+      Push-AppveyorArtifact $crashDump -FileName "nvda_install_crash.dmp"
+      Add-AppveyorMessage "Install process crashed"
+      $errorCode=1
+     }
      if($errorCode -ne 0) { $host.SetShouldExit($errorCode) }
 
 test_script:
diff --git a/source/core.py b/source/core.py
@@ -111,9 +111,9 @@ def onResult(ID):
 def restart(disableAddons=False, debugLogging=False):
 	"""Restarts NVDA by starting a new copy."""
 	if globalVars.appArgs.launcher:
-		import wx
+		import gui
 		globalVars.exitCode=3
-		wx.GetApp().ExitMainLoop()
+		wx.CallAfter(gui.mainFrame.Destroy)
 		return
 	import subprocess
 	import winUser
diff --git a/source/gui/__init__.py b/source/gui/__init__.py
@@ -77,7 +77,7 @@ def __init__(self):
 
 	def Destroy(self):
 		self.sysTrayIcon.Destroy()
-		super(MainFrame, self).Destroy()
+		super().Destroy()
 
 	def prePopup(self):
 		"""Prepare for a popup.
@@ -199,7 +199,7 @@ def onExitCommand(self, evt):
 			d.Show()
 			self.postPopup()
 		else:
-			wx.GetApp().ExitMainLoop()
+			wx.CallAfter(self.Destroy)
 
 	def onNVDASettingsCommand(self,evt):
 		self._popupSettingsDialog(NVDASettingsDialog)
@@ -359,6 +359,7 @@ def onConfigProfilesCommand(self, evt):
 		ProfilesDialog(gui.mainFrame).Show()
 		self.postPopup()
 
+
 class SysTrayIcon(wx.adv.TaskBarIcon):
 
 	def __init__(self, frame):
@@ -712,7 +713,7 @@ def onOk(self, evt):
 		if action >= 2 and config.isAppX:
 			action += 1
 		if action == 0:
-			wx.GetApp().ExitMainLoop()
+			wx.CallAfter(mainFrame.Destroy)
 		elif action == 1:
 			queueHandler.queueFunction(queueHandler.eventQueue,core.restart)
 		elif action == 2:
diff --git a/source/gui/guiHelper.py b/source/gui/guiHelper.py
@@ -1,9 +1,7 @@
-# -*- coding: UTF-8 -*-
-#guiHelper.py
-#A part of NonVisual Desktop Access (NVDA)
-#Copyright (C) 2016 NV Access Limited
-#This file is covered by the GNU General Public License.
-#See the file COPYING for more details.
+# A part of NonVisual Desktop Access (NVDA)
+# Copyright (C) 2016-2021 NV Access Limited
+# This file is covered by the GNU General Public License.
+# See the file COPYING for more details.
 
 
 """ Utilities to simplify the creation of wx GUIs, including automatic management of spacing.
@@ -369,6 +367,9 @@ def addDialogDismissButtons(self, buttons, separated=False):
 		self.dialogDismissButtonsAdded = True
 		return buttons
 
+
+
+
 class SIPABCMeta(wx.siplib.wrappertype, ABCMeta):
 	"""Meta class to be used for wx subclasses with abstract methods."""
 	pass
diff --git a/source/gui/installerGui.py b/source/gui/installerGui.py
@@ -102,7 +102,7 @@ def doInstall(
 			winUser.SW_SHOWNORMAL
 		)
 	else:
-		wx.GetApp().ExitMainLoop()
+		wx.CallAfter(gui.mainFrame.Destroy)
 
 
 def doSilentInstall(
@@ -450,7 +450,7 @@ def doCreatePortable(portableDirectory,copyUserConfig=False,silent=False,startAf
 		return
 	d.done()
 	if silent:
-		wx.GetApp().ExitMainLoop()
+		wx.CallAfter(gui.mainFrame.Destroy)
 	else:
 		# Translators: The message displayed when a portable copy of NVDA has been successfully created.
 		# %s will be replaced with the destination directory.
diff --git a/source/gui/startupDialogs.py b/source/gui/startupDialogs.py
@@ -117,7 +117,8 @@ def run(cls):
 		gui.mainFrame.prePopup()
 		d = cls(gui.mainFrame)
 		d.ShowModal()
-		d.Destroy()
+		if d and not d.IsBeingDeleted():
+			wx.CallAfter(d.Destroy)
 		gui.mainFrame.postPopup()
 
 
@@ -193,7 +194,7 @@ def onContinueRunning(self, evt):
 		core.doStartupDialogs()
 
 	def onExit(self, evt):
-		wx.GetApp().ExitMainLoop()
+		wx.CallAfter(gui.mainFrame.Destroy)
 
 	@classmethod
 	def run(cls):
