Skip to content

Commit d2762d6

Browse files
committed
#2414 fix crash hovering mouse over removed table column header
1 parent 84b40f5 commit d2762d6

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

Source/SPCustomQuery.m

+1
Original file line numberDiff line numberDiff line change
@@ -1670,6 +1670,7 @@ - (void) updateTableView
16701670
// Remove all existing columns from the table
16711671
theColumns = [customQueryView tableColumns];
16721672
while ([theColumns count]) {
1673+
[NSArrayObjectAtIndex(theColumns, 0) setHeaderToolTip:nil]; // prevent crash #2414
16731674
[customQueryView removeTableColumn:NSArrayObjectAtIndex(theColumns, 0)];
16741675
}
16751676

Source/SPTableContent.m

+4
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,7 @@ - (void) setTableDetails:(NSDictionary *)tableDetails
447447
if (!newTableName) {
448448
// Remove existing columns from the table
449449
while ([[tableContentView tableColumns] count]) {
450+
[NSArrayObjectAtIndex([tableContentView tableColumns], 0) setHeaderToolTip:nil]; // prevent crash #2414
450451
[tableContentView removeTableColumn:NSArrayObjectAtIndex([tableContentView tableColumns], 0)];
451452
}
452453

@@ -505,6 +506,7 @@ - (void) setTableDetails:(NSDictionary *)tableDetails
505506
#ifndef SP_CODA
506507
// Clear filter table
507508
while ([[filterTableView tableColumns] count]) {
509+
[NSArrayObjectAtIndex([filterTableView tableColumns], 0) setHeaderToolTip:nil]; // prevent crash #2414
508510
[filterTableView removeTableColumn:NSArrayObjectAtIndex([filterTableView tableColumns], 0)];
509511
}
510512
// Clear filter table data
@@ -519,12 +521,14 @@ - (void) setTableDetails:(NSDictionary *)tableDetails
519521

520522
// Remove existing columns from the table
521523
while ([[tableContentView tableColumns] count]) {
524+
[NSArrayObjectAtIndex([tableContentView tableColumns], 0) setHeaderToolTip:nil]; // prevent crash #2414
522525
[tableContentView removeTableColumn:NSArrayObjectAtIndex([tableContentView tableColumns], 0)];
523526
}
524527
#ifndef SP_CODA
525528
// Remove existing columns from the filter table
526529
[filterTableView abortEditing];
527530
while ([[filterTableView tableColumns] count]) {
531+
[NSArrayObjectAtIndex([filterTableView tableColumns], 0) setHeaderToolTip:nil]; // prevent crash #2414
528532
[filterTableView removeTableColumn:NSArrayObjectAtIndex([filterTableView tableColumns], 0)];
529533
}
530534
// Clear filter table data

0 commit comments

Comments
 (0)