1 files changed, 7 insertions, 3 deletions
diff --git a/src/base_tab/BaseTab.cpp b/src/base_tab/BaseTab.cpp
index 730db84..157b3d0 100644
--- a/src/base_tab/BaseTab.cpp
+++ b/src/base_tab/BaseTab.cpp
@@ -29,13 +29,16 @@ void BaseTab::OnImport(wxCommandEvent &event) {
   dia->ShowModal();
   game_list->DeleteAllItems();
   deleted.clear();
+  edited.clear();
   LoadFile();
 }
 
 void BaseTab::OnDelete(wxCommandEvent &event) {
-  long selected =
-      game_list->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
-  if (selected >= 0) {
+  long selected = -1;
+
+  while ((selected = game_list->GetNextItem(selected, wxLIST_NEXT_ALL,
+                                            wxLIST_STATE_SELECTED)) !=
+         wxNOT_FOUND) {
     wxListItem listItem;
     listItem.m_itemId = selected; // sets row
     listItem.m_col = 0;           // sets column
@@ -56,6 +59,7 @@ void BaseTab::OnSave(wxCommandEvent &event) {
       edited.end()); // Add edited game (since they are also deleted)
   base->Save(deleted, new_games_bases, new_games);
   game_list->DeleteAllItems();
+  edited.clear();
   deleted.clear();
   LoadFile();
 }