mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-10-16 07:50:28 +02:00
ManagedTexture: CreateTextureFromFileData should not return a ManagedTexture object if it fails.
Alternatively, we should add even more checks around the code for empty ManagedTextures...
This commit is contained in:
1 parent
fed779e21a
commit
0bf44827b7
1 file changed
+7
-2
+7
-2
@@ -200,6 +200,11 @@ std::unique_ptr<ManagedTexture> CreateTextureFromFileData(Draw::DrawContext *dra
|
||||
if (!draw)
|
||||
return std::unique_ptr<ManagedTexture>();
|
||||
ManagedTexture *mtex = new ManagedTexture(draw);
|
||||
mtex->LoadFromFileData(data, size, type, generateMips);
|
||||
return std::unique_ptr<ManagedTexture>(mtex);
|
||||
if (mtex->LoadFromFileData(data, size, type, generateMips)) {
|
||||
return std::unique_ptr<ManagedTexture>(mtex);
|
||||
} else {
|
||||
// Best to return a null pointer if we fail!
|
||||
delete mtex;
|
||||
return std::unique_ptr<ManagedTexture>();
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user