[Scummvm-git-logs] scummvm master -> 91ac560619edb36a1c5a314d15275a10b8674a56

[npjg]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
91ac560619 DIRECTOR: Remove erroneous widget deletion


Commit: 91ac560619edb36a1c5a314d15275a10b8674a56
    https://github.com/scummvm/scummvm/commit/91ac560619edb36a1c5a314d15275a10b8674a56
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-07-24T09:19:19-04:00

Commit Message:
DIRECTOR: Remove erroneous widget deletion

This reverts commit 48599bd622d9e6d7fb04caa97607c35e55d9e331.

Changed paths:
    engines/director/castmember.cpp
    engines/director/castmember.h


diff --git a/engines/director/castmember.cpp b/engines/director/castmember.cpp
index fb723f7ca7..069472c418 100644
--- a/engines/director/castmember.cpp
+++ b/engines/director/castmember.cpp
@@ -45,13 +45,8 @@ CastMember::CastMember(Cast *cast, uint16 castId, Common::SeekableReadStreamEndi
 	_modified = true;
 }
 
-CastMember::~CastMember() {
-	if (_widget)
-		delete _widget;
-}
-
 BitmapCastMember::BitmapCastMember(Cast *cast, uint16 castId, Common::SeekableReadStreamEndian &stream, uint32 castTag, uint16 version, uint8 flags1)
-		: CastMember(cast, castId, stream) {
+	: CastMember(cast, castId, stream) {
 	_type = kCastBitmap;
 	_img = nullptr;
 	_matte = nullptr;
diff --git a/engines/director/castmember.h b/engines/director/castmember.h
index 8698ef14b8..c28c5b2d37 100644
--- a/engines/director/castmember.h
+++ b/engines/director/castmember.h
@@ -55,7 +55,7 @@ struct Resource;
 class CastMember {
 public:
 	CastMember(Cast *cast, uint16 castId, Common::SeekableReadStreamEndian &stream);
-	virtual ~CastMember();
+	virtual ~CastMember() {}
 
 	Cast *getCast() { return _cast; }
 	uint16 getID() { return _castId; }