From b073579f4424356a7f707bc22b6ff45253866216 Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Sun, 5 Mar 2023 12:33:47 +0100
Subject: [PATCH] Fixed a rare crash when editing custom collections.

---
 es-app/src/views/ViewController.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/es-app/src/views/ViewController.cpp b/es-app/src/views/ViewController.cpp
index 28080944a..3b5e4847e 100644
--- a/es-app/src/views/ViewController.cpp
+++ b/es-app/src/views/ViewController.cpp
@@ -1214,9 +1214,9 @@ void ViewController::reloadGamelistView(GamelistView* view, bool reloadTheme)
             std::shared_ptr<GamelistView> newView {getGamelistView(system)};
 
             // To counter having come from a placeholder.
-            if (!cursor->isPlaceHolder()) {
+            if (!cursor->isPlaceHolder() && cursor->getParent() != nullptr)
                 newView->setCursor(cursor);
-            }
+
             if (isCurrent)
                 mCurrentView = newView;