13
0

fix bitwise-vs-logic AND (thanks, clang!)

This commit is contained in:
Paul Davis 2024-10-10 19:20:58 -06:00
parent c2deacdd54
commit dab9775223

View File

@ -300,20 +300,20 @@ ExportProfileManager::load_preset_from_disk (std::string const& path)
bool
ExportProfileManager::set_state (XMLNode const& root)
{
return set_global_state (root) & set_local_state (root);
return set_global_state (root) && set_local_state (root);
}
bool
ExportProfileManager::set_global_state (XMLNode const& root)
{
return init_filenames (root.children ("ExportFilename")) &
return init_filenames (root.children ("ExportFilename")) &&
init_formats (root.children ("ExportFormat"));
}
bool
ExportProfileManager::set_local_state (XMLNode const& root)
{
return init_timespans (root.children ("ExportTimespan")) &
return init_timespans (root.children ("ExportTimespan")) &&
init_channel_configs (root.children ("ExportChannelConfiguration"));
}