summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Dean <mdean@mythtv.org>2010-11-21 22:41:37 (GMT)
committer Mike Dean <mdean@mythtv.org>2010-11-21 22:41:37 (GMT)
commit2ca5fd80e40ccd551a945b4645c63c683f4649c8 (patch)
tree617c96a90dbfc83027d1f0566e8442a9bcc0d549
parent0604ffb02d42070dae7296b462fece17ef80ad89 (diff)
Fix a segfault when exiting the Recording Profile settings screen. Backports [27191] and [27192] from trunk. Fixes #9104.
git-svn-id: http://svn.mythtv.org/svn/branches/release-0-24-fixes@27315 7dbf422c-18fa-0310-86e9-fd20926502f2
-rw-r--r--mythtv/libs/libmythtv/recordingprofile.cpp8
-rw-r--r--mythtv/libs/libmythtv/recordingprofile.h1
2 files changed, 1 insertions, 8 deletions
diff --git a/mythtv/libs/libmythtv/recordingprofile.cpp b/mythtv/libs/libmythtv/recordingprofile.cpp
index 1f0cf91..9905844 100644
--- a/mythtv/libs/libmythtv/recordingprofile.cpp
+++ b/mythtv/libs/libmythtv/recordingprofile.cpp
@@ -1166,6 +1166,7 @@ class RecordingProfilePopup
}
};
+// id and name will be deleted by ConfigurationGroup's destructor
RecordingProfile::RecordingProfile(QString profName)
: id(new ID()), name(new Name(*this)),
imageSize(NULL), videoSettings(NULL),
@@ -1216,13 +1217,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);