Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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 9bfcd4e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
9 changes: 2 additions & 7 deletions mythtv/libs/libmythtv/recordingprofile.cpp
Expand Up @@ -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),
Expand Down Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion mythtv/libs/libmythtv/recordingprofile.h
Expand Up @@ -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);
Expand Down

0 comments on commit 9bfcd4e

Please sign in to comment.