(regexps_to_predicate): Don't modify the display predicate for balance
commands if a payee regexp is being processed.
This commit is contained in:
parent
557e103b2e
commit
46978b2d5d
1 changed files with 3 additions and 3 deletions
|
|
@ -128,7 +128,7 @@ regexps_to_predicate(config_t& config, const std::string& command,
|
||||||
add_predicate = 1;
|
add_predicate = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (i != 1 && command == "b") {
|
if (i != 1 && command == "b" && account_regexp) {
|
||||||
if (! config.display_predicate.empty())
|
if (! config.display_predicate.empty())
|
||||||
config.display_predicate += "&";
|
config.display_predicate += "&";
|
||||||
else if (! config.show_empty)
|
else if (! config.show_empty)
|
||||||
|
|
@ -182,11 +182,11 @@ void config_t::process_options(const std::string& command,
|
||||||
if (*i == "--")
|
if (*i == "--")
|
||||||
break;
|
break;
|
||||||
|
|
||||||
regexps_to_predicate(*this, command, arg, i, true,
|
regexps_to_predicate(*this, command, arg, i++, true,
|
||||||
(command == "b" && ! show_subtotal &&
|
(command == "b" && ! show_subtotal &&
|
||||||
display_predicate.empty()));
|
display_predicate.empty()));
|
||||||
if (i != args_end)
|
if (i != args_end)
|
||||||
regexps_to_predicate(*this, command, ++i, args_end);
|
regexps_to_predicate(*this, command, i, args_end);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Setup the default value for the display predicate
|
// Setup the default value for the display predicate
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue