diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/compare.cc | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/src/compare.cc b/src/compare.cc index 63b85154..121f3014 100644 --- a/src/compare.cc +++ b/src/compare.cc @@ -88,15 +88,23 @@ bool compare_items<post_t>::operator()(post_t * left, post_t * right) post_t::xdata_t& lxdata(left->xdata()); if (! lxdata.has_flags(POST_EXT_SORT_CALC)) { - bind_scope_t bound_scope(*sort_order.get_context(), *left); - find_sort_values(lxdata.sort_values, bound_scope); + if (sort_order.get_context()) { + bind_scope_t bound_scope(*sort_order.get_context(), *left); + find_sort_values(lxdata.sort_values, bound_scope); + } else { + find_sort_values(lxdata.sort_values, *left); + } lxdata.add_flags(POST_EXT_SORT_CALC); } post_t::xdata_t& rxdata(right->xdata()); if (! rxdata.has_flags(POST_EXT_SORT_CALC)) { - bind_scope_t bound_scope(*sort_order.get_context(), *right); - find_sort_values(rxdata.sort_values, bound_scope); + if (sort_order.get_context()) { + bind_scope_t bound_scope(*sort_order.get_context(), *right); + find_sort_values(rxdata.sort_values, bound_scope); + } else { + find_sort_values(rxdata.sort_values, *right); + } rxdata.add_flags(POST_EXT_SORT_CALC); } @@ -111,15 +119,23 @@ bool compare_items<account_t>::operator()(account_t * left, account_t * right) account_t::xdata_t& lxdata(left->xdata()); if (! lxdata.has_flags(ACCOUNT_EXT_SORT_CALC)) { - bind_scope_t bound_scope(*sort_order.get_context(), *left); - find_sort_values(lxdata.sort_values, bound_scope); + if (sort_order.get_context()) { + bind_scope_t bound_scope(*sort_order.get_context(), *left); + find_sort_values(lxdata.sort_values, bound_scope); + } else { + find_sort_values(lxdata.sort_values, *left); + } lxdata.add_flags(ACCOUNT_EXT_SORT_CALC); } account_t::xdata_t& rxdata(right->xdata()); if (! rxdata.has_flags(ACCOUNT_EXT_SORT_CALC)) { - bind_scope_t bound_scope(*sort_order.get_context(), *right); - find_sort_values(rxdata.sort_values, bound_scope); + if (sort_order.get_context()) { + bind_scope_t bound_scope(*sort_order.get_context(), *right); + find_sort_values(rxdata.sort_values, bound_scope); + } else { + find_sort_values(rxdata.sort_values, *right); + } rxdata.add_flags(ACCOUNT_EXT_SORT_CALC); } |