From c5c3b0109a1384d8e851629421e5ccc9cc2fc6bc Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Sun, 6 May 2012 15:50:41 +0400 Subject: [PATCH 1/2] gui/motorcontrol.cpp: fix memleak - delete sig/snr scale in dtor --- src/gui/motorcontrol.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gui/motorcontrol.cpp b/src/gui/motorcontrol.cpp index 4df5d3506..6334a1946 100644 --- a/src/gui/motorcontrol.cpp +++ b/src/gui/motorcontrol.cpp @@ -72,8 +72,11 @@ CMotorControl::CMotorControl(int tnum) CMotorControl::~CMotorControl() { -printf("CMotorControl::~CMotorControl\n"); + printf("CMotorControl::~CMotorControl\n"); + delete sigscale; + delete snrscale; } + void CMotorControl::Init(void) { frameBuffer = CFrameBuffer::getInstance(); From f37540ccf775fa31c5d935ce827d6831797d9384 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Sun, 6 May 2012 15:51:14 +0400 Subject: [PATCH 2/2] zapit/src/capmt.cpp: fix crash on channel stop, if recording --- src/zapit/src/capmt.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/zapit/src/capmt.cpp b/src/zapit/src/capmt.cpp index b9ec2ae41..301345ac5 100644 --- a/src/zapit/src/capmt.cpp +++ b/src/zapit/src/capmt.cpp @@ -253,6 +253,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start uint8_t list = CCam::CAPMT_FIRST; for (it = channel_map.begin(); it != channel_map.end(); /*++it*/) { + cam = it->second; channel = CServiceManager::getInstance()->FindChannel(it->first); ++it; if(!channel)