From 14d5a404b2b0a3f3f4daaed75d32d3de51416f36 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Sat, 14 Oct 2023 18:23:35 +0100
Subject: [PATCH] Don't leave deleted items in a group.

Fixes https://gitlab.com/kicad/code/kicad/-/issues/15797
---
 pcbnew/footprint_libraries_utils.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pcbnew/footprint_libraries_utils.cpp b/pcbnew/footprint_libraries_utils.cpp
index b8562e2e29..410ec0fb1d 100644
--- a/pcbnew/footprint_libraries_utils.cpp
+++ b/pcbnew/footprint_libraries_utils.cpp
@@ -38,6 +38,7 @@
 #include <tools/board_editor_control.h>
 #include <tools/pad_tool.h>
 #include <footprint.h>
+#include <pcb_group.h>
 #include <board_commit.h>
 #include <footprint_edit_frame.h>
 #include <wildcards_and_files_ext.h>
@@ -49,7 +50,7 @@
 #include <project_pcb.h>
 #include <project/project_file.h>
 #include <footprint_editor_settings.h>
-#include "footprint_viewer_frame.h"
+#include <footprint_viewer_frame.h>
 #include <wx/choicdlg.h>
 #include <wx/filedlg.h>
 #include <wx/fswatcher.h>
@@ -670,7 +671,8 @@ void PCB_EDIT_FRAME::ExportFootprintsToLibrary( bool aStoreInNewLib, const wxStr
                     pi->FootprintSave( libPath, fpCopy );
 
                     // Remove reference to the group before deleting
-                    fpCopy->SetParentGroup( nullptr );
+                    if( PCB_GROUP* parentGroup = fpCopy->GetParentGroup() )
+                        parentGroup->RemoveItem( fpCopy );
 
                     delete fpCopy;
                 }