From a532d1d6678e415a062a4e688e5063b937128180 Mon Sep 17 00:00:00 2001
From: Rebecca Breu <rebecca@rbreu.de>
Date: Fri, 29 Mar 2024 23:24:26 +0100
Subject: [PATCH] Fixed an intermittent crash when invoking New Scene

Multiselect item will get cleared, too, and can't be accesed. Ignore
scene change events during cleaning, because those want to access the
multi select item.
---
 CHANGELOG.rst   |  1 +
 beeref/scene.py | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 2b1a4a4..fbca9ad 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -27,6 +27,7 @@ Fixed
 * Fixed a crash when importing images with unsupported exif orientation info
 * Fixed threading issue when importing images (causing potential
   hangs/weird behaviour)
+* Fixed an intermittent crash when invoking New Scene
 
 
 
diff --git a/beeref/scene.py b/beeref/scene.py
index 4e40b33..91f2f28 100644
--- a/beeref/scene.py
+++ b/beeref/scene.py
@@ -45,20 +45,22 @@ class BeeGraphicsScene(QtWidgets.QGraphicsScene):
         self.max_z = 0
         self.min_z = 0
         self.Z_STEP = 0.001
-        self.multi_select_item = MultiSelectItem()
-        self.rubberband_item = RubberbandItem()
         self.selectionChanged.connect(self.on_selection_change)
         self.changed.connect(self.on_change)
         self.items_to_add = Queue()
-        self.internal_clipboard = []
         self.edit_item = None
         self.crop_item = None
         self.settings = BeeSettings()
+        self.clear()
+        self._clear_ongoing = False
 
     def clear(self):
+        self._clear_ongoing = True
         super().clear()
         self.internal_clipboard = []
         self.rubberband_item = RubberbandItem()
+        self.multi_select_item = MultiSelectItem()
+        self._clear_ongoing = False
 
     def addItem(self, item):
         logger.debug(f'Adding item {item}')
@@ -452,6 +454,10 @@ class BeeGraphicsScene(QtWidgets.QGraphicsScene):
         return (rect.topLeft() + rect.bottomRight()) / 2
 
     def on_selection_change(self):
+        if self._clear_ongoing:
+            # Ignore events while clearing the scene since the
+            # multiselect item will get cleared, too
+            return
         if self.has_multi_selection():
             self.multi_select_item.fit_selection_area(
                 self.itemsBoundingRect(selection_only=True))
@@ -462,6 +468,10 @@ class BeeGraphicsScene(QtWidgets.QGraphicsScene):
             self.removeItem(self.multi_select_item)
 
     def on_change(self, region):
+        if self._clear_ongoing:
+            # Ignore events while clearing the scene since the
+            # multiselect item will get cleared, too
+            return
         if (self.multi_select_item.scene()
                 and self.multi_select_item.active_mode is None):
             self.multi_select_item.fit_selection_area(