[Scummvm-cvs-logs] scummvm master -> 8e161e003529b9ffb703783264b29403ddf0ec97
Strangerke
Strangerke at scummvm.org
Wed Nov 25 00:28:17 CET 2015
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:
8e161e0035 MADS: NEBULAR: Fix another (potential) memory leak
Commit: 8e161e003529b9ffb703783264b29403ddf0ec97
https://github.com/scummvm/scummvm/commit/8e161e003529b9ffb703783264b29403ddf0ec97
Author: Strangerke (strangerke at scummvm.org)
Date: 2015-11-25T00:22:24+01:00
Commit Message:
MADS: NEBULAR: Fix another (potential) memory leak
Changed paths:
engines/mads/nebular/dialogs_nebular.cpp
diff --git a/engines/mads/nebular/dialogs_nebular.cpp b/engines/mads/nebular/dialogs_nebular.cpp
index a5c6a56..ede16e1 100644
--- a/engines/mads/nebular/dialogs_nebular.cpp
+++ b/engines/mads/nebular/dialogs_nebular.cpp
@@ -82,11 +82,14 @@ bool DialogsNebular::show(int messageId, int objectId) {
if (centerFlag) {
crFlag = true;
} else {
- if (objectId == -1) {
+ if (dialog)
+ delete dialog;
+
+ if (objectId == -1)
dialog = new TextDialog(_vm, FONT_INTERFACE, _defaultPosition, _dialogWidth);
- } else {
+ else
dialog = new PictureDialog(_vm, _defaultPosition, _dialogWidth, objectId);
- }
+
dialog->wordWrap(dialogText);
dialog->incNumLines();
}
@@ -146,11 +149,10 @@ bool DialogsNebular::show(int messageId, int objectId) {
}
if (!dialog) {
- if (objectId == -1) {
+ if (objectId == -1)
dialog = new TextDialog(_vm, FONT_INTERFACE, _defaultPosition, _dialogWidth);
- } else {
+ else
dialog = new PictureDialog(_vm, _defaultPosition, _dialogWidth, objectId);
- }
}
if (centerFlag) {
More information about the Scummvm-git-logs
mailing list