canvas/main: Delete the initial window when closed

Author: ales-erjavec

Orange/canvas/__main__.py

@@ -400,6 +400,7 @@ def onrequest(url):
     QDir.addSearchPath("canvas_icons", os.path.join(dirpath, "icons"))
 
     canvas_window = CanvasMainWindow()
+    canvas_window.setAttribute(Qt.WA_DeleteOnClose)
     canvas_window.setWindowIcon(config.application_icon())
 
     if stylesheet_string is not None:
@@ -481,8 +482,8 @@ def show_message(message):
         canvas_window.load_scheme(open_requests[-1].toLocalFile())
 
     # local references prevent destruction
-    _ = show_survey()
-    __ = check_for_updates()
+    survey = show_survey()
+    update_check = check_for_updates()
 
     # Tee stdout and stderr into Output dock
     log_view = canvas_window.log_view()
@@ -510,12 +511,14 @@ def show_message(message):
             status = app.exec_()
     except BaseException:
         log.error("Error in main event loop.", exc_info=True)
+        status = 42
 
-    canvas_window.deleteLater()
-    app.processEvents()
-    app.flush()
     del canvas_window
+    del survey
+    del update_check
 
+    app.processEvents()
+    app.flush()
     # Collect any cycles before deleting the QApplication instance
     gc.collect()