[Scummvm-git-logs] scummvm master -> 9f91a01124b5af15c6cafe0986fe0ce86971dc65

[sluicebox]

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:
9f91a01124 COMMON: Fix DiskImage stream deletion


Commit: 9f91a01124b5af15c6cafe0986fe0ce86971dc65
    https://github.com/scummvm/scummvm/commit/9f91a01124b5af15c6cafe0986fe0ce86971dc65
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2024-08-26T11:55:36-07:00

Commit Message:
COMMON: Fix DiskImage stream deletion

Changed paths:
    common/formats/disk_image.cpp


diff --git a/common/formats/disk_image.cpp b/common/formats/disk_image.cpp
index 9d77213d633..f14b23cb23d 100644
--- a/common/formats/disk_image.cpp
+++ b/common/formats/disk_image.cpp
@@ -576,8 +576,8 @@ bool DiskImage::open(const Common::String &name, Common::File *f) {
 		warning("Unrecognized disk image '%s' of size %d bytes (expected %d bytes)", name.c_str(), (int)getDiskStream()->size(), expectedSize);
 		if (_inputStream != f) {
 			delete _inputStream;
-			_inputStream = nullptr;
 		}
+		_inputStream = nullptr;
 		delete _decodeStream;
 		_decodeStream = nullptr;
 		return false;