Merge branch 'hotfix/3.5.1'

This commit is contained in:
patrick96
2020-12-12 13:28:57 +01:00
30 changed files with 310 additions and 210 deletions

View File

@ -16,7 +16,7 @@ namespace modules {
template class module<cpu_module>;
cpu_module::cpu_module(const bar_settings& bar, string name_) : timer_module<cpu_module>(bar, move(name_)) {
m_interval = m_conf.get<decltype(m_interval)>(name(), "interval", 1s);
set_interval(1s);
m_totalwarn = m_conf.get(name(), "warn-percentage", m_totalwarn);
m_ramp_padding = m_conf.get<decltype(m_ramp_padding)>(name(), "ramp-coreload-spacing", 1);