Skip to content

K
kicad-source-mirror
Commit 2fa082f6 authored by Dick Hollenbeck's avatar Dick Hollenbeck
Browse files
Options

fix bug lp:1319839

parent f31f92e4
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 4 deletions
pcbnew/dialogs/dialog_fp_lib_table.cpp
View file @ 2fa082f6
...@@ -166,7 +166,9 @@ public: ...@@ -166,7 +166,9 @@ public:
bool DeleteRows( size_t aPos, size_t aNumRows ) bool DeleteRows( size_t aPos, size_t aNumRows )
{ {
if( aPos + aNumRows <= rows.size() ) // aPos may be a large positive, e.g. size_t(-1), and the sum of
// aPos+aNumRows may wrap here, so both ends of the range are tested.
if( aPos < rows.size() && aPos + aNumRows <= rows.size() )
{ {
ROWS_ITER start = rows.begin() + aPos; ROWS_ITER start = rows.begin() + aPos;
rows.erase( start, start + aNumRows ); rows.erase( start, start + aNumRows );
...@@ -512,10 +514,13 @@ private: ...@@ -512,10 +514,13 @@ private:
int rowCount = m_cur_grid->GetNumberRows(); int rowCount = m_cur_grid->GetNumberRows();
int curRow = getCursorRow(); int curRow = getCursorRow();
m_cur_grid->DeleteRows( curRow ); if( curRow >= 0 )
{
m_cur_grid->DeleteRows( curRow );
if( curRow && curRow == rowCount - 1 ) if( curRow && curRow == rowCount - 1 )
m_cur_grid->SetGridCursor( curRow-1, getCursorCol() ); m_cur_grid->SetGridCursor( curRow-1, getCursorCol() );
}
} }
void moveUpHandler( wxMouseEvent& event ) void moveUpHandler( wxMouseEvent& event )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment