| File src/ui/fileview.c changed (mode: 100644) (index 84badae62..c88d33731) |
| ... |
... |
column_line_match(const char full_column[], const format_info_t *info, |
| 1305 |
1305 |
const column_data_t *cdt = info->data; |
const column_data_t *cdt = info->data; |
| 1306 |
1306 |
dir_entry_t *entry = cdt->entry; |
dir_entry_t *entry = cdt->entry; |
| 1307 |
1307 |
|
|
| 1308 |
|
int is_searchable_column = is_primary_column_id(info->id); |
|
| 1309 |
|
if(!is_searchable_column || cdt->view->matches == 0 || !entry->search_match || |
|
| 1310 |
|
cdt->custom_match) |
|
|
1308 |
|
/* Check trivial conditions before invoking is_primary_column_id() as it can |
|
1309 |
|
* reach into Lua data structures, which is slower than these checks. */ |
|
1310 |
|
if(cdt->view->matches == 0 || !entry->search_match || cdt->custom_match) |
|
1311 |
|
{ |
|
1312 |
|
return; |
|
1313 |
|
} |
|
1314 |
|
|
|
1315 |
|
const int is_searchable_column = is_primary_column_id(info->id); |
|
1316 |
|
if(!is_searchable_column) |
| 1311 |
1317 |
{ |
{ |
| 1312 |
1318 |
return; |
return; |
| 1313 |
1319 |
} |
} |