Merge pull request #1363 from MageKing17/bugfix/generic-anim-static-png

asarium · web-flow · commit ec3313ffea33 · 2017-06-04T09:40:27.000+02:00
Reset generic animation type to BM_TYPE_NONE if APNG processing fails.
diff --git a/code/graphics/generic.cpp b/code/graphics/generic.cpp
@@ -226,6 +226,7 @@ int generic_anim_stream(generic_anim *ga, const bool cache)
 				mprintf(("Failed to load apng: %s\n", e.what() ));
 				delete ga->png.anim;
 				ga->png.anim = nullptr;
+				ga->type = BM_TYPE_NONE;
 				return -1;
 			}
 			nprintf(("apng", "apng read OK (%ix%i@%i) duration (%f)\n", ga->png.anim->w, ga->png.anim->h,

Original file line number	Diff line number	Diff line change
`@@ -226,6 +226,7 @@ int generic_anim_stream(generic_anim *ga, const bool cache)`
`226`	`226`	`mprintf(("Failed to load apng: %s\n", e.what() ));`
`227`	`227`	`delete ga->png.anim;`
`228`	`228`	`ga->png.anim = nullptr;`
	`229`	`+ ga->type = BM_TYPE_NONE;`
`229`	`230`	`return -1;`
`230`	`231`	`}`
`231`	`232`	`nprintf(("apng", "apng read OK (%ix%i@%i) duration (%f)\n", ga->png.anim->w, ga->png.anim->h,`