[Scummvm-git-logs] scummvm master -> b2f8b313621c5cbd721b04c9ac061949caee94e0

[bluegr]

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:
b2f8b31362 MTROPOLIS: move assert after nullptr check


Commit: b2f8b313621c5cbd721b04c9ac061949caee94e0
    https://github.com/scummvm/scummvm/commit/b2f8b313621c5cbd721b04c9ac061949caee94e0
Author: Michael (michael_kuerbis at web.de)
Date: 2024-05-21T01:47:09+03:00

Commit Message:
MTROPOLIS: move assert after nullptr check

Changed paths:
    engines/mtropolis/runtime.cpp


diff --git a/engines/mtropolis/runtime.cpp b/engines/mtropolis/runtime.cpp
index df536fa824e..6f7cc7d3acf 100644
--- a/engines/mtropolis/runtime.cpp
+++ b/engines/mtropolis/runtime.cpp
@@ -7704,9 +7704,9 @@ Common::SharedPtr<Modifier> Project::loadModifierObject(ModifierLoaderContext &l
 
 		modifier = factory->createModifier(loaderContext, dataObject);
 	}
-	assert(modifier->getModifierFlags().flagsWereLoaded);
 	if (!modifier)
 		error("Modifier object failed to load");
+	assert(modifier->getModifierFlags().flagsWereLoaded);
 
 	uint32 guid = modifier->getStaticGUID();
 	const Common::HashMap<uint32, Common::SharedPtr<ModifierHooks> > &hooksMap = getRuntime()->getHacks().modifierHooks;