mirror of
https://github.com/esphome/esphome.git
synced 2025-10-04 19:03:47 +01:00
Merge remote-tracking branch 'origin/integration' into integration
This commit is contained in:
@@ -149,8 +149,8 @@ class APIServer : public Component, public Controller {
|
||||
#ifdef USE_API_YAML_SERVICES
|
||||
return this->user_services_;
|
||||
#else
|
||||
static const std::vector<UserServiceDescriptor *> empty;
|
||||
return this->user_services_ ? *this->user_services_ : empty;
|
||||
static const std::vector<UserServiceDescriptor *> EMPTY;
|
||||
return this->user_services_ ? *this->user_services_ : EMPTY;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user