Rooba
/
polybar
mirror of https://github.com/polybar/polybar.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(script): Avoid duplicate action tags for tailed 

If a tailed command is used polybar would generate two action tags, one
with %counter% replaced and one with %pid% replaced, but never both

This is a bug that was introduced in #934
This commit is contained in:
patrick96 2018-10-04 16:08:48 +02:00 committed by NBonaparte
parent 13b0ee7454
commit abdd5f9233
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/modules/script.cpp
View File

@ -179,15 +179,16 @@ namespace modules {
auto action = m_actions[btn];
if (!action.empty()) {
m_builder->cmd(btn, string_util::replace_all(action, "%counter%", cnt));
auto action_replaced = string_util::replace_all(action, "%counter%", cnt);
/*
* The pid token is only for tailed commands.
* If the command is not specified or running, replacement is unnecessary as well
*/
if(m_tail && m_command && m_command->is_running()) {
m_builder->cmd(btn, string_util::replace_all(action, "%pid%", to_string(m_command->get_pid())));
action_replaced = string_util::replace_all(action_replaced, "%pid%", to_string(m_command->get_pid()));
}
m_builder->cmd(btn, action_replaced);
}
}