Permalink
Browse files

Refs #9104. Remove some redundant deletes added in [26228] to fix a s…

…egfault when exiting the Recording Profile settings screen. Both id and name are deleted by ConfigurationGroup's destructor.

git-svn-id: http://svn.mythtv.org/svn/trunk@27191 7dbf422c-18fa-0310-86e9-fd20926502f2
  • Loading branch information...
sphery committed Nov 12, 2010
1 parent b9efe92 commit 9bfcd4e02db21e43631b41c43aca59089b90ea9b
Showing with 2 additions and 8 deletions.
  1. +2 −7 mythtv/libs/libmythtv/recordingprofile.cpp
  2. +0 −1 mythtv/libs/libmythtv/recordingprofile.h
@@ -1166,6 +1166,8 @@ class RecordingProfilePopup
}
};
+// id and name are new'ed objects, but will be deleted by
+// ConfigurationGroup's destructor
RecordingProfile::RecordingProfile(QString profName)
: id(new ID()), name(new Name(*this)),
imageSize(NULL), videoSettings(NULL),
@@ -1216,13 +1218,6 @@ RecordingProfile::RecordingProfile(QString profName)
addChild(profile);
};
-RecordingProfile::~RecordingProfile()
-{
- id->deleteLater();
- delete name;
- name = NULL;
-}
-
void RecordingProfile::ResizeTranscode(bool resize)
{
MythWizard *wizard = (MythWizard *)dialog;
@@ -85,7 +85,6 @@ class MPUBLIC RecordingProfile : public QObject, public ConfigurationWizard
public:
// initializers
RecordingProfile(QString profName = QString());
- ~RecordingProfile();
virtual void loadByID(int id);
virtual bool loadByType(const QString &name, const QString &cardtype);
virtual bool loadByGroup(const QString &name, const QString &group);

0 comments on commit 9bfcd4e

Please sign in to comment.