Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

B2016-130: fix crash on working with iteminfolists (inserting into list when it should not)

Browse Source
This commit is contained in:
Kathy Ruffing 2017-08-08 15:15:27 +00:00
parent e702d5d8fc
commit 21fe413ff9
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
PROMS/VEPROMS.CSLA.Library/Generated/ItemInfoList.cs
View File

@ -59,6 +59,7 @@ namespace VEPROMS.CSLA.Library
RefreshingList = false; RefreshingList = false;
} }
} }
// sender can be either the current item changed, or the current item with one added before it (when an item is inserted)
void tmp_Changed(object sender) void tmp_Changed(object sender)
{ {
for (int i = 0; i < Count; i++) for (int i = 0; i < Count; i++)
@ -68,8 +69,11 @@ namespace VEPROMS.CSLA.Library
// Added insert to fix when item is replaced and a 'delete' is done, the item needs inserted. Note // Added insert to fix when item is replaced and a 'delete' is done, the item needs inserted. Note
// that when text is modified, i.e. 'Changed', this code is not executed. Fixed B2016-130. // that when text is modified, i.e. 'Changed', this code is not executed. Fixed B2016-130.
RefreshingList = true; RefreshingList = true;
IsReadOnly = false; IsReadOnly = false;
Items.Insert(i, (sender as ItemInfo).MyPrevious); // the following checks to see if the previous is this one, and if so, it is not an insert it is a change
// On an insert, inserting from 'sender', MyPrevious is set as the new item.
if (SourceOfList != "Search" && (sender as ItemInfo).MyPrevious != null && i > 0 && base[i - 1].ItemID != (sender as ItemInfo).MyPrevious.ItemID)
Items.Insert(i, (sender as ItemInfo).MyPrevious);
IsReadOnly = true; IsReadOnly = true;
this.OnListChanged(new ListChangedEventArgs(ListChangedType.ItemChanged, i)); this.OnListChanged(new ListChangedEventArgs(ListChangedType.ItemChanged, i));
RefreshingList = false; RefreshingList = false;
@ -77,6 +81,20 @@ namespace VEPROMS.CSLA.Library
} }
} }
} }
private string _SourceOfList;
public string SourceOfList
{
get { return _SourceOfList; }
set { _SourceOfList = value; }
}
//private void ShowList(string txt)
//{
// Console.WriteLine("\r\n{0} - {1} - {2}: i, base[i].Ordinal, base[i].ItemID, base[i].DisplayText", txt, Count, SourceOfList);
// for (int i = 0; i < Count; i++)
// {
// Console.WriteLine("{0}, {1}, {2}, {3}, {4}, {5}", i, base[i].Ordinal, base[i].ItemID, base[i].DisplayText, base[i].MyItemInfoUnique, base[i].Disposed);
// }
//}
private bool _Disposed = false; private bool _Disposed = false;
private static int _CountCreated = 0; private static int _CountCreated = 0;
private static int _CountDisposed = 0; private static int _CountDisposed = 0;