obitools/obitools3
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 66 Wiki Activity

Fixed a problem where a view would have a wrong line count after adding

Browse Source 
a first column to it if there was already a Line selection associated
(happening when cloning), and fixed a bad error check.
This commit is contained in:
Celine Mercier
2017-04-14 16:25:55 +02:00
parent 537b9847da
commit 2f0c4b90d7
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/obiview.c
View File

@ -879,18 +879,21 @@ static int update_lines(Obiview_p view, index_t line_count)
// Clone the column first if needed // Clone the column first if needed
if (!(column->writable)) if (!(column->writable))
{ {
if (clone_column_in_view(view, (((view->infos)->column_references)[i]).alias) < 0) column = clone_column_in_view(view, (((view->infos)->column_references)[i]).alias);
if (column == NULL)
{ {
obidebug(1, "\nError cloning a column in a view when updating its line count"); obidebug(1, "\nError cloning a column in a view when updating its line count");
return -1; return -1;
} }
} }
// Enlarge the column if needed // Enlarge the column if needed
while (line_count > (column->header)->line_count) while (line_count > (column->header)->line_count)
{ {
if (obi_enlarge_column(column) < 0) if (obi_enlarge_column(column) < 0)
return -1; return -1;
} }
// Set the number of lines used to the new view line count // Set the number of lines used to the new view line count
(column->header)->lines_used = line_count; (column->header)->lines_used = line_count;
} }
@ -2247,8 +2250,8 @@ int obi_view_add_column(Obiview_p view,
// Save column alias // Save column alias
strcpy((((view->infos)->column_references)[(view->infos)->column_count]).alias, alias); strcpy((((view->infos)->column_references)[(view->infos)->column_count]).alias, alias);
// If it's the first column of the view, set the view's line count to the column's line count // If it's the first column of the view, set the view's line count to the column's line count, except if there's a line selection associated
if ((view->infos)->column_count == 0) if (((view->infos)->column_count == 0) && (view->line_selection == NULL))
(view->infos)->line_count = (column->header)->lines_used; (view->infos)->line_count = (column->header)->lines_used;
// Update column count in view // Update column count in view