Merge 0461ed4 into 67ecd25

seanbudd · web-flow · commit bf47e7bfd1b8 · 2023-07-07T13:56:56.000+10:00
diff --git a/source/gui/__init__.py b/source/gui/__init__.py
@@ -342,14 +342,11 @@ def onAddonStoreCommand(self, evt: wx.MenuEvent):
 		from ._addonStoreGui import AddonStoreDialog
 		from ._addonStoreGui.viewModels.store import AddonStoreVM
 		_storeVM = AddonStoreVM()
+		_storeVM.refresh()
 		try:
-			d = AddonStoreDialog(mainFrame, _storeVM)
+			AddonStoreDialog(mainFrame, _storeVM).Show()
 		except SettingsDialog.MultiInstanceErrorWithDialog as errorWithDialog:
 			errorWithDialog.dialog.SetFocus()
-		else:
-			_storeVM.refresh()
-			d.Maximize()
-			d.Show()
 		self.postPopup()
 
 	def onReloadPluginsCommand(self, evt):
diff --git a/source/gui/_addonStoreGui/controls/storeDialog.py b/source/gui/_addonStoreGui/controls/storeDialog.py
@@ -50,6 +50,7 @@ def __init__(self, parent: wx.Window, storeVM: AddonStoreVM):
 		self._storeVM.onDisplayableError.register(self.handleDisplayableError)
 		self._actionsContextMenu = _ActionsContextMenu(self._storeVM)
 		super().__init__(parent, resizeable=True, buttons={wx.CLOSE})
+		self.Maximize()
 
 	def _enterActivatesOk_ctrlSActivatesApply(self, evt: wx.KeyEvent):
 		"""Disables parent behaviour which overrides behaviour for enter and ctrl+s"""
@@ -235,7 +236,13 @@ def onClose(self, evt: wx.CommandEvent):
 				).format(len(addonDataManager._downloadsPendingInstall))
 			)
 			self._storeVM.installPending()
-			wx.CallAfter(installingDialog.done)
+
+			def postInstall():
+				installingDialog.done()
+				# let the dialog exit.
+				super().onClose(evt)
+
+			return wx.CallAfter(postInstall)
 
 		# let the dialog exit.
 		super().onClose(evt)
diff --git a/source/gui/settingsDialogs.py b/source/gui/settingsDialogs.py
@@ -141,9 +141,12 @@ def __new__(cls, *args, **kwargs):
 				"Only one instance of SettingsDialog can exist at a time",
 			)
 		if state is cls.DialogState.DESTROYED and not multiInstanceAllowed:
-			# the dialog has been destroyed by wx, but the instance is still available. This indicates there is something
-			# keeping it alive.
-			log.error("Opening new settings dialog while instance still exists: {!r}".format(firstMatchingInstance))
+			# The dialog has been destroyed by wx, but the instance is still available.
+			# This indicates there is something keeping it alive.
+			log.debugWarning("Opening new settings dialog while instance still exists: {!r}".format(firstMatchingInstance))
+			# Handle gracefully
+			SettingsDialog._instances[firstMatchingInstance] = cls.DialogState.CREATED
+			return firstMatchingInstance
 		obj = super(SettingsDialog, cls).__new__(cls, *args, **kwargs)
 		SettingsDialog._instances[obj] = cls.DialogState.CREATED
 		return obj
