From 1bb045690588821f1efcd80a213f417df70fbfcb Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Thu, 9 May 2019 15:57:15 +0200 Subject: [PATCH] capmt: avoid use cam after delete (re-add this commit; was removed by mistake) Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/1f3af481c82c102308bb02b0f5301c5d99e4ddb4 Author: Jacek Jendrzej Date: 2019-05-09 (Thu, 09 May 2019) --- src/zapit/src/capmt.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/zapit/src/capmt.cpp b/src/zapit/src/capmt.cpp index ca3fc5edd..ac52a294a 100644 --- a/src/zapit/src/capmt.cpp +++ b/src/zapit/src/capmt.cpp @@ -296,7 +296,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start cam->sendMessage(NULL, 0, false); /* clean up channel_map with stopped record/stream/pip services NOT live-tv */ it = channel_map.find(channel_id); - if(it != channel_map.end() && newmask != 0) + if(it != channel_map.end() && newmask != 0 && it->second != cam) { delete it->second; channel_map.erase(channel_id);