summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Dean <mdean@mythtv.org>2010-11-12 05:31:08 (GMT)
committer Mike Dean <mdean@mythtv.org>2010-11-12 05:31:08 (GMT)
commit9bfcd4e02db21e43631b41c43aca59089b90ea9b (patch)
treeef8576548de5d04c2e72eaf9aa5eec2ae5599990
parentb9efe922d71dc4c19e7ec852b925f5dea7c6ff16 (diff)
Refs #9104. Remove some redundant deletes added in [26228] to fix a segfault 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
-rw-r--r--mythtv/libs/libmythtv/recordingprofile.cpp9
-rw-r--r--mythtv/libs/libmythtv/recordingprofile.h1
2 files changed, 2 insertions, 8 deletions
diff --git a/mythtv/libs/libmythtv/recordingprofile.cpp b/mythtv/libs/libmythtv/recordingprofile.cpp
index 1f0cf91..78e7bf8 100644
--- a/mythtv/libs/libmythtv/recordingprofile.cpp
+++ b/mythtv/libs/libmythtv/recordingprofile.cpp
@@ -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;
diff --git a/mythtv/libs/libmythtv/recordingprofile.h b/mythtv/libs/libmythtv/recordingprofile.h
index 7e25307..5ebc220 100644
--- a/mythtv/libs/libmythtv/recordingprofile.h
+++ b/mythtv/libs/libmythtv/recordingprofile.h
@@ -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);