Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tcpip_adapter: unregister shutdown handlers, don’t fail on repeated registration

Browse source
This commit is contained in:
Ivan Grokhotkov 2019-04-08 19:30:32 +08:00
parent b1a722b2ca
commit 198d7d4754
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
components/tcpip_adapter/event_handlers.c
View file

@ -242,7 +242,7 @@ esp_err_t tcpip_adapter_set_default_wifi_handlers()
} }
err = esp_register_shutdown_handler((shutdown_handler_t)esp_wifi_stop); err = esp_register_shutdown_handler((shutdown_handler_t)esp_wifi_stop);
if (err != ESP_OK) { if (err != ESP_OK && err != ESP_ERR_INVALID_STATE) {
goto fail; goto fail;
} }
@ -263,8 +263,7 @@ esp_err_t tcpip_adapter_clear_default_wifi_handlers()
esp_event_handler_unregister(WIFI_EVENT, WIFI_EVENT_AP_STOP, handle_ap_stop); esp_event_handler_unregister(WIFI_EVENT, WIFI_EVENT_AP_STOP, handle_ap_stop);
esp_event_handler_unregister(IP_EVENT, IP_EVENT_STA_GOT_IP, handle_sta_got_ip); esp_event_handler_unregister(IP_EVENT, IP_EVENT_STA_GOT_IP, handle_sta_got_ip);
esp_event_handler_unregister(IP_EVENT, IP_EVENT_ETH_GOT_IP, handle_eth_got_ip); esp_event_handler_unregister(IP_EVENT, IP_EVENT_ETH_GOT_IP, handle_eth_got_ip);
esp_unregister_shutdown_handler((shutdown_handler_t)esp_wifi_stop);
/* TODO: introduce esp_unregister_shutdown_handler or similar, call it here */
return ESP_OK; return ESP_OK;
} }