stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2024-11-23 12:22:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Resource List Editor: fixed potential crash on pasting/replacing resources when there are duplicate resources in the list.

Browse source 
Resource List Editor: duplicate resources are no longer added when adding resources using drag and drop.
This commit is contained in:
MaxED 2014-12-12 14:14:52 +00:00
parent 1648f1628b
commit 12830020f9
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Source/Core/Controls/ResourceListEditor.cs
View file

@ -217,8 +217,11 @@ namespace CodeImp.DoomBuilder.Controls
if(!data.GetDataPresent(DataFormats.FileDrop)) return;
string[] paths = (string[])data.GetData(DataFormats.FileDrop);
Dictionary<string, bool> curlocations = GetLocationNames();
foreach(string path in paths)
{
if(curlocations.ContainsKey(path)) continue;
if(File.Exists(path))
{
string ext = Path.GetExtension(path);
@ -429,7 +432,7 @@ namespace CodeImp.DoomBuilder.Controls
// Don't do stupid things
if(copiedresources.Count == 0) return;
Dictionary<string, ListViewItem> curlocations = GetLocationNames();
Dictionary<string, bool> curlocations = GetLocationNames();
int pastedcount = 0;
foreach(DataLocation dl in copiedresources)
{
@ -466,7 +469,7 @@ namespace CodeImp.DoomBuilder.Controls
}
// Paste new resources
Dictionary<string, ListViewItem> curlocations = GetLocationNames();
Dictionary<string, bool> curlocations = GetLocationNames();
foreach(DataLocation dl in copiedresources)
{
if(curlocations.ContainsKey(dl.location)) continue;
@ -504,14 +507,14 @@ namespace CodeImp.DoomBuilder.Controls
if(OnContentChanged != null) OnContentChanged();
}
private Dictionary<string, ListViewItem> GetLocationNames()
private Dictionary<string, bool> GetLocationNames()
{
Dictionary<string, ListViewItem> dict = new Dictionary<string, ListViewItem>(resourceitems.Items.Count);
Dictionary<string, bool> dict = new Dictionary<string, bool>(resourceitems.Items.Count);
foreach(ListViewItem item in resourceitems.Items)
{
if(!(item.Tag is DataLocation)) continue;
DataLocation dl = (DataLocation)item.Tag;
dict.Add(dl.location, item);
if(!dict.ContainsKey(dl.location)) dict.Add(dl.location, false);
}
return dict;