Skip to content

Commit

Permalink
Services API: Fixes #13106 (memory leak)
Browse files Browse the repository at this point in the history
  • Loading branch information
Bill Meek committed Aug 20, 2017
1 parent 38de2d0 commit 777965c
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions mythtv/programs/mythbackend/services/video.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ DTC::VideoMetadataInfo* Video::GetVideoByFileName( const QString &FileName )
{
VideoMetadataListManager::metadata_list videolist;
VideoMetadataListManager::loadAllFromDatabase(videolist);
VideoMetadataListManager *mlm = new VideoMetadataListManager();
QScopedPointer<VideoMetadataListManager> mlm(new VideoMetadataListManager());
mlm->setList(videolist);
VideoMetadataListManager::VideoMetadataPtr metadata = mlm->byFilename(FileName);

Expand All @@ -169,8 +169,6 @@ DTC::VideoMetadataInfo* Video::GetVideoByFileName( const QString &FileName )

FillVideoMetadataInfo ( pVideoMetadataInfo, metadata, true );

delete mlm;

return pVideoMetadataInfo;
}

Expand Down Expand Up @@ -301,15 +299,13 @@ bool Video::RemoveVideoFromDB( int Id )

VideoMetadataListManager::metadata_list videolist;
VideoMetadataListManager::loadAllFromDatabase(videolist);
VideoMetadataListManager *mlm = new VideoMetadataListManager();
QScopedPointer<VideoMetadataListManager> mlm(new VideoMetadataListManager());
mlm->setList(videolist);
VideoMetadataListManager::VideoMetadataPtr metadata = mlm->byID(Id);

if (metadata)
bResult = metadata->DeleteFromDatabase();

delete mlm;

return bResult;
}

Expand Down

0 comments on commit 777965c

Please sign in to comment.