From e0b67515a8ed6187c73aa1227943bff5f55b40bf Mon Sep 17 00:00:00 2001
From: KillzXGaming <millernathan35@gmail.com>
Date: Thu, 29 Aug 2019 19:48:07 -0400
Subject: [PATCH] File selector fixes

---
 File_Format_Library/GUI/BFLYT/FileSelector.cs | 20 +++++++++++++------
 File_Format_Library/GUI/BFLYT/LayoutEditor.cs |  4 ++--
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/File_Format_Library/GUI/BFLYT/FileSelector.cs b/File_Format_Library/GUI/BFLYT/FileSelector.cs
index cf0273f4..0aeb55a5 100644
--- a/File_Format_Library/GUI/BFLYT/FileSelector.cs
+++ b/File_Format_Library/GUI/BFLYT/FileSelector.cs
@@ -24,20 +24,28 @@ namespace LayoutBXLYT
             listViewCustom1.MultiSelect = true;
         }
 
-        public List<int> SelectedIndices()
+        public List<BFLYT> SelectedLayouts()
         {
-            List<int> indices = new List<int>();
-            foreach (int index in listViewCustom1.SelectedIndices)
-                indices.Add(index);
+            List<BFLYT> layouts = new List<BFLYT>();
+            foreach (ListViewItem item in listViewCustom1.SelectedItems)
+                layouts.Add((BFLYT)item.Tag);
 
-            return indices;
+            listViewCustom1.Items.Clear();
+
+            return layouts;
         }
 
         public void LoadLayoutFiles(List<BFLYT> layoutFiles)
         {
             listViewCustom1.BeginUpdate();
             foreach (var file in layoutFiles)
-                listViewCustom1.Items.Add(file.FileName);
+            {
+                listViewCustom1.Items.Add(new ListViewItem()
+                {
+                    Text = file.FileName,
+                    Tag = file,
+                });
+            }
 
             listViewCustom1.Sort();
             listViewCustom1.EndUpdate();
diff --git a/File_Format_Library/GUI/BFLYT/LayoutEditor.cs b/File_Format_Library/GUI/BFLYT/LayoutEditor.cs
index 67602822..a227ef15 100644
--- a/File_Format_Library/GUI/BFLYT/LayoutEditor.cs
+++ b/File_Format_Library/GUI/BFLYT/LayoutEditor.cs
@@ -287,9 +287,9 @@ namespace LayoutBXLYT
                     form.LoadLayoutFiles(layouts);
                     if (form.ShowDialog() == DialogResult.OK)
                     {
-                        foreach (var index in form.SelectedIndices())
+                        foreach (var layout in form.SelectedLayouts())
                         {
-                            LoadBflyt(layouts[index].header, file.FileName);
+                            LoadBflyt(layout.header, file.FileName);
                         }
                     }                    
                 }