@@ -297,16 +297,18 @@ CHIP_ERROR ESPWiFiDriver::StartScanWiFiNetworks(ByteSpan ssid)
297
297
298
298
void ESPWiFiDriver::OnScanWiFiNetworkDone ()
299
299
{
300
+ if (!mpScanCallback)
301
+ {
302
+ ChipLogProgress (DeviceLayer, " No scan callback" );
303
+ return ;
304
+ }
300
305
uint16_t ap_number;
301
306
esp_wifi_scan_get_ap_num (&ap_number);
302
307
if (!ap_number)
303
308
{
304
309
ChipLogProgress (DeviceLayer, " No AP found" );
305
- if (mpScanCallback != nullptr )
306
- {
307
- mpScanCallback->OnFinished (Status::kSuccess , CharSpan (), nullptr );
308
- mpScanCallback = nullptr ;
309
- }
310
+ mpScanCallback->OnFinished (Status::kSuccess , CharSpan (), nullptr );
311
+ mpScanCallback = nullptr ;
310
312
return ;
311
313
}
312
314
@@ -317,11 +319,8 @@ void ESPWiFiDriver::OnScanWiFiNetworkDone()
317
319
if (ap_buffer_ptr == NULL )
318
320
{
319
321
ChipLogError (DeviceLayer, " can't malloc memory for ap_list_buffer" );
320
- if (mpScanCallback)
321
- {
322
- mpScanCallback->OnFinished (Status::kUnknownError , CharSpan (), nullptr );
323
- mpScanCallback = nullptr ;
324
- }
322
+ mpScanCallback->OnFinished (Status::kUnknownError , CharSpan (), nullptr );
323
+ mpScanCallback = nullptr ;
325
324
return ;
326
325
}
327
326
wifi_ap_record_t * ap_list_buffer = ap_buffer_ptr.get ();
@@ -343,16 +342,19 @@ void ESPWiFiDriver::OnScanWiFiNetworkDone()
343
342
{
344
343
ap_buffer_ptr.release ();
345
344
}
346
- }
347
- else
348
- {
349
- ChipLogError (DeviceLayer, " can't get ap_records " );
350
- if (mpScanCallback)
345
+ else
351
346
{
347
+ ChipLogError (DeviceLayer, " can't schedule the scan result processing" );
352
348
mpScanCallback->OnFinished (Status::kUnknownError , CharSpan (), nullptr );
353
349
mpScanCallback = nullptr ;
354
350
}
355
351
}
352
+ else
353
+ {
354
+ ChipLogError (DeviceLayer, " can't get ap_records " );
355
+ mpScanCallback->OnFinished (Status::kUnknownError , CharSpan (), nullptr );
356
+ mpScanCallback = nullptr ;
357
+ }
356
358
}
357
359
358
360
void ESPWiFiDriver::OnNetworkStatusChange ()
0 commit comments