hyprwm/aquamarine
1
0
Fork 0
mirror of https://github.com/hyprwm/aquamarine.git synced 2024-11-17 03:46:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

backend: avoid out_of_range on iterating options

Browse source
This commit is contained in:
Vaxry 2024-06-28 17:35:43 +02:00
parent 40f6fa5173
commit 0ffcb7fa74
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/backend/Backend.cpp
View file

@ -80,15 +80,23 @@ bool Aquamarine::CBackend::start() {
bool fallback = false; bool fallback = false;
int started = 0; int started = 0;
auto optionsForType = [this] (eBackendType type) -> SBackendImplementationOptions {
for (auto& o : implementationOptions) {
if (o.backendType == type)
return o;
}
return SBackendImplementationOptions{};
};
for (size_t i = 0; i < implementations.size(); ++i) { for (size_t i = 0; i < implementations.size(); ++i) {
const bool ok = implementations.at(i)->start(); const bool ok = implementations.at(i)->start();
if (!ok) { if (!ok) {
log(AQ_LOG_ERROR, std::format("Requested backend ({}) could not start, enabling fallbacks", backendTypeToName(implementationOptions.at(i).backendType))); log(AQ_LOG_ERROR, std::format("Requested backend ({}) could not start, enabling fallbacks", backendTypeToName(implementations.at(i)->type())));
fallback = true; fallback = true;
if (implementationOptions.at(i).backendRequestMode == AQ_BACKEND_REQUEST_MANDATORY) { if (optionsForType(implementations.at(i)->type()).backendRequestMode == AQ_BACKEND_REQUEST_MANDATORY) {
log(AQ_LOG_CRITICAL, log(AQ_LOG_CRITICAL,
std::format("Requested backend ({}) could not start and it's mandatory, cannot continue!", backendTypeToName(implementationOptions.at(i).backendType))); std::format("Requested backend ({}) could not start and it's mandatory, cannot continue!", backendTypeToName(implementations.at(i)->type())));
implementations.clear(); implementations.clear();
return false; return false;
} }