Make closing/deleting window consistent

avalon/tools/creator/app.py

@@ -563,9 +563,11 @@ def show(debug=False, parent=None):
 
     """
 
-    if module.window:
+    try:
         module.window.close()
-        del(module.window)
+        del module.window
+    except (RuntimeError, AttributeError):
+        pass
 
     with lib.application():
         window = Window(parent)

avalon/tools/loader/app.py

@@ -385,26 +385,11 @@ def show(debug=False, parent=None, use_context=False):
 
     """
 
-    # Remember window
-    if module.window is not None:
-        try:
-            module.window.show()
-
-            # If the window is minimized then unminimize it.
-            if module.window.windowState() & QtCore.Qt.WindowMinimized:
-                module.window.setWindowState(QtCore.Qt.WindowActive)
-
-            # Raise and activate the window
-            module.window.raise_()             # for MacOS
-            module.window.activateWindow()     # for Windows
-            module.window.refresh()
-            return
-        except RuntimeError as e:
-            if not str(e).rstrip().endswith("already deleted."):
-                raise
-
-            # Garbage collected
-            module.window = None
+    try:
+        module.window.close()
+        del module.window
+    except (RuntimeError, AttributeError):
+        pass
 
     with lib.application():
 

avalon/tools/workfiles/app.py

@@ -468,8 +468,12 @@ def show(root=None, debug=False, parent=None):
             to this QObject.
 
     """
+
+    try:
         module.window.close()
-        del(module.window)
+        del module.window
+    except (RuntimeError, AttributeError):
+        pass
 
     host = api.registered_host()
     if host is None: