From 735f84089c260259f77a8d47a138ce896dd3f6f6 Mon Sep 17 00:00:00 2001
From: Dean Lee <deanlee3@gmail.com>
Date: Sun, 9 Aug 2020 06:50:36 +0800
Subject: [PATCH] fix bug that visionstream_destroy may be called twice (#1999)

old-commit-hash: cccb63229d9b6d953bfa62b57327d345403c85b2
---
 selfdrive/modeld/dmonitoringmodeld.cc | 5 +----
 selfdrive/modeld/modeld.cc            | 4 +---
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/selfdrive/modeld/dmonitoringmodeld.cc b/selfdrive/modeld/dmonitoringmodeld.cc
index 140b567ad3..28776f94ee 100644
--- a/selfdrive/modeld/dmonitoringmodeld.cc
+++ b/selfdrive/modeld/dmonitoringmodeld.cc
@@ -56,7 +56,6 @@ int main(int argc, char **argv) {
       buf = visionstream_get(&stream, &extra);
       if (buf == NULL) {
         printf("visionstream get failed\n");
-        visionstream_destroy(&stream);
         break;
       }
       //printf("frame_id: %d %dx%d\n", extra.frame_id, buf_info.width, buf_info.height);
@@ -84,11 +83,9 @@ int main(int argc, char **argv) {
       LOGD("dmonitoring process: %.2fms, from last %.2fms", t2-t1, t1-last);
       last = t1;
     }
-
+    visionstream_destroy(&stream);
   }
 
-  visionstream_destroy(&stream);
-
   dmonitoring_free(&dmonitoringmodel);
 
   return 0;
diff --git a/selfdrive/modeld/modeld.cc b/selfdrive/modeld/modeld.cc
index f367c99097..33dafc86cf 100644
--- a/selfdrive/modeld/modeld.cc
+++ b/selfdrive/modeld/modeld.cc
@@ -190,7 +190,6 @@ int main(int argc, char **argv) {
       buf = visionstream_get(&stream, &extra);
       if (buf == NULL) {
         LOGW("visionstream get failed");
-        visionstream_destroy(&stream);
         break;
       }
 
@@ -239,10 +238,9 @@ int main(int argc, char **argv) {
 
     }
     visionbuf_free(&yuv_ion);
+    visionstream_destroy(&stream);
   }
 
-  visionstream_destroy(&stream);
-
   model_free(&model);
 
   LOG("joining live_thread");