[Scummvm-git-logs] scummvm master -> 89580f2f9c99ed9f170ebd811f1434c91a8b891d

[elasota]

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:
89580f2f9c MTROPOLIS: Fix assert crash in Obsidian demo


Commit: 89580f2f9c99ed9f170ebd811f1434c91a8b891d
    https://github.com/scummvm/scummvm/commit/89580f2f9c99ed9f170ebd811f1434c91a8b891d
Author: elasota (ejlasota at gmail.com)
Date: 2022-08-06T06:04:41-04:00

Commit Message:
MTROPOLIS: Fix assert crash in Obsidian demo

Changed paths:
    engines/mtropolis/runtime.cpp


diff --git a/engines/mtropolis/runtime.cpp b/engines/mtropolis/runtime.cpp
index cd1098c2da5..b9c1bd4d376 100644
--- a/engines/mtropolis/runtime.cpp
+++ b/engines/mtropolis/runtime.cpp
@@ -1659,8 +1659,8 @@ void DynamicValue::setFromOther(const DynamicValue &other) {
 	case DynamicValueTypes::kNull:
 	case DynamicValueTypes::kIncomingData:
 	case DynamicValueTypes::kEmpty:
-		_type = other._type;
 		clear();
+		_type = other._type;
 		break;
 	case DynamicValueTypes::kInteger:
 		setInt(other._value.asInt);