Fix Webcam compilation with define USE_WEBCAM but without `define E…

…NABLE_RTSPSERVER` (#22686)
arendst · Dec 20, 2024 · 8311bff · 8311bff
1 parent fde529f
commit 8311bff
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,12 +11,13 @@ All notable changes to this project will be documented in this file.
 ### Breaking Changed
 
 ### Changed
-- ESP32 disable PSRAM check (and on restart some relay toggles) with `#define DISABLE_PSRAMCHECK` (#21266)
+- ESP32 disable PSRAM check (and on restart some relay toggles) with `#define DISABLE_PSRAMCHECK true` (#21266)
 - TLS disable ECDSA for MQTT to ensure we don't break fingerprints after #22649
 
 ### Fixed
 - Berry Zigbee fix wrong attributes (#22684)
-- Berry fix walrus operator
+- Berry walrus operator (#22685)
+- Webcam compilation with `define USE_WEBCAM` but without `define ENABLE_RTSPSERVER` (#22686)
 
 ### Removed
 

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -122,9 +122,11 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
 ### Breaking Changed
 
 ### Changed
-- ESP32 disable PSRAM check (and on restart some relay toggles) with `#define DISABLE_PSRAMCHECK` [#21266](https://github.com/arendst/Tasmota/issues/21266)
+- ESP32 disable PSRAM check (and on restart some relay toggles) with `#define DISABLE_PSRAMCHECK true` [#21266](https://github.com/arendst/Tasmota/issues/21266)
 
 ### Fixed
+- Webcam compilation with `define USE_WEBCAM` but without `define ENABLE_RTSPSERVER` [#22686](https://github.com/arendst/Tasmota/issues/22686)
 - Berry Zigbee fix wrong attributes [#22684](https://github.com/arendst/Tasmota/issues/22684)
+- Berry walrus operator [#22685](https://github.com/arendst/Tasmota/issues/22685)
 
 ### Removed
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_81_esp32_webcam.ino b/tasmota/tasmota_xdrv_driver/xdrv_81_esp32_webcam.ino
@@ -159,7 +159,7 @@ struct {
   uint16_t width;
   uint16_t height;
   uint8_t  stream_active;
- #ifndef USE_WEBCAM_SETUP_ONLY
+#ifndef USE_WEBCAM_SETUP_ONLY
   WiFiClient client;
   ESP8266WebServer *CamServer;
   struct PICSTORE picstore[MAX_PICSTORE];
@@ -169,9 +169,9 @@ struct {
   CRtspSession *rtsp_session;
   WiFiClient rtsp_client;
   uint8_t rtsp_start;
-#endif // ENABLE_RTSPSERVER
   OV2640 cam;
   uint32_t rtsp_lastframe_time;
+#endif // ENABLE_RTSPSERVER
 #endif // USE_WEBCAM_SETUP_ONLY
 } Wc;