Fix crash on multiple carousel screens overlapping and using back fea…

…ture. Order of carousels are now proper.
MathNodes · Jun 24, 2024 · aa5f215 · aa5f215
1 parent 61a5a7e
commit aa5f215
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/ui/screens.py b/src/ui/screens.py
@@ -1891,8 +1891,14 @@ def add_rv_data(self, node):
 
     def set_previous_screen(self):
         mw = Meile.app.root.get_screen(WindowNames.MAIN_WINDOW)
-        mw.carousel.remove_widget(mw.NodeWidget)
-        mw.carousel.load_previous()
+        try:
+            while len(mw.carousel.slides) > 1:
+                mw.carousel.remove_widget(mw.carousel.slides[-1])
+        except Exception as e:
+            print(str(e))
+            pass
+
+        mw.carousel.load_slide(mw.carousel.slides[0])
 
 class PlanScreen(MDBoxLayout):
     def __init__(self, **kwargs):

diff --git a/src/ui/widgets.py b/src/ui/widgets.py
@@ -1518,7 +1518,7 @@ def switch_carousel(self):
         mw = Meile.app.root.get_screen(WindowNames.MAIN_WINDOW)
         mw.clear_node_carousel()
         mw.carousel.remove_widget(self)
-        mw.carousel.load_slide(mw.NodeWidget)
+        mw.carousel.load_slide(mw.carousel.slides[-1])
 
     def closeDialogReturnToSubscriptions(self,inst):
         self.dialog.dismiss()