fix(demo mode): Deinit demo mode when main init is aborted (#198)

Slider0007 · Jan 10, 2025 · bbc15a0 · bbc15a0
1 parent 232509d
commit bbc15a0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/code/components/camera_ctrl/ClassControlCamera.cpp b/code/components/camera_ctrl/ClassControlCamera.cpp
@@ -1142,14 +1142,12 @@ bool ClassControlCamera::loadNextDemoImage(camera_fb_t *_fb)
 /* Free only user allocated memory without deinit of cam driver */
 void ClassControlCamera::freeDemoMemoryOnly()
 {
-    demoFiles.clear();
-    std::vector<std::string>().swap(demoFiles); // Ensure that memory allocated by vector gets freed
+    disableDemoMode();
 }
 
 
 ClassControlCamera::~ClassControlCamera()
 {
+    disableDemoMode();
     deinitCam();
-    demoFiles.clear();
-    std::vector<std::string>().swap(demoFiles); // Ensure that memory allocated by vector gets freed
 }
diff --git a/code/components/mainprocess_ctrl/ClassFlowTakeImage.cpp b/code/components/mainprocess_ctrl/ClassFlowTakeImage.cpp
@@ -172,4 +172,5 @@ time_t ClassFlowTakeImage::getTimeImageTaken()
 ClassFlowTakeImage::~ClassFlowTakeImage()
 {
     delete rawImage;
+    cameraCtrl.freeDemoMemoryOnly();
 }