Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix infinite loop when deleting columns from wxTreeListCtrl.

Browse Source 
Wrong variable was checked in the loop adjusting the columns values resulting
in an infinite loop.

Closes #16955.
This commit is contained in:
Vadim Zeitlin
2015-04-22 14:49:04 +02:00
parent b5ef2ac489
commit eeebfdcc8c
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/generic/treelist.cpp
View File

@@ -170,10 +170,15 @@ public:
wxScopedArray<wxString> oldTexts(m_columnsTexts); wxScopedArray<wxString> oldTexts(m_columnsTexts);
m_columnsTexts = new wxString[numColumns - 2]; m_columnsTexts = new wxString[numColumns - 2];
// As above, n is the index in the new column texts array and m is the
// index in the old one.
for ( unsigned n = 1, m = 1; n < numColumns - 1; n++, m++ ) for ( unsigned n = 1, m = 1; n < numColumns - 1; n++, m++ )
{ {
if ( n == col ) if ( m == col )
{ {
// Skip copying the deleted column and keep the new index the
// same (so compensate for "n++" done in the loop).
n--; n--;
} }
else // Not the deleted column. else // Not the deleted column.