Merge from 5.x: PR #17579

spyder-ide · Mar 30, 2022 · 838b752 · 838b752
2 parents 34826d6 + e1de0ee
commit 838b752
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 19 deletions.
diff --git a/spyder/api/plugin_registration/registry.py b/spyder/api/plugin_registration/registry.py
@@ -530,6 +530,23 @@ def delete_all_plugins(self, excluding: Optional[Set[str]] = None,
         if not can_close:
             return False
 
+        # Delete Spyder 4 internal plugins
+        for plugin_name in set(self.internal_plugins):
+            if plugin_name not in excluding:
+                plugin_instance = self.plugin_registry[plugin_name]
+                if isinstance(plugin_instance, SpyderPlugin):
+                    try:
+                        plugin_instance.deleteLater()
+                    except RuntimeError:
+                        pass
+                    can_close &= self.delete_plugin(
+                        plugin_name, teardown=False)
+                    if not can_close and not close_immediately:
+                        break
+
+        if not can_close:
+            return False
+
         # Delete Spyder 5+ external plugins
         for plugin_name in set(self.external_plugins):
             if plugin_name not in excluding:
@@ -565,24 +582,7 @@ def delete_all_plugins(self, excluding: Optional[Set[str]] = None,
         if not can_close and not close_immediately:
             return False
 
-        # Delete Spyder 4 internal plugins
-        for plugin_name in set(self.internal_plugins):
-            if plugin_name not in excluding:
-                plugin_instance = self.plugin_registry[plugin_name]
-                if isinstance(plugin_instance, SpyderPlugin):
-                    try:
-                        plugin_instance.close()
-                        plugin_instance.deleteLater()
-                    except RuntimeError:
-                        pass
-                    can_close &= self.delete_plugin(
-                        plugin_name, teardown=False)
-                    if not can_close and not close_immediately:
-                        break
-
-        if not can_close:
-            return False
-
+        # Delete Spyder 5 internal plugins
         for plugin_name in set(self.internal_plugins):
             if plugin_name not in excluding:
                 plugin_instance = self.plugin_registry[plugin_name]

diff --git a/spyder/app/mainwindow.py b/spyder/app/mainwindow.py
@@ -1535,7 +1535,6 @@ def closing(self, cancelable=False, close_immediately=False):
             # Open files/project, check unsaved files, etc.
             if self.editor is not None:
                 try:
-                    self.editor.close()
                     self.editor.deleteLater()
                     self.plugin_registry.delete_plugin(
                         Plugins.Editor, teardown=False)