Skip to content

bugfix(display): Add null check for raw texture data #436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
seer-by-sentry wants to merge 1 commit into
base: main
Choose a base branch
from
+2 −2
Open

bugfix(display): Add null check for raw texture data #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2544,7 +2544,7 @@ void W3DDisplay::drawImage( const Image *image, Int startX, Int startY,
}

// if we have raw texture data we will use it, otherwise we are referencing filenames
if( BitIsSet( image->getStatus(), IMAGE_STATUS_RAW_TEXTURE ) )
if( BitIsSet( image->getStatus(), IMAGE_STATUS_RAW_TEXTURE ) && image->getRawTextureData() != nullptr )
m_2DRender->Set_Texture( (TextureClass *)(image->getRawTextureData()) );
else
m_2DRender->Set_Texture( image->getFilename().str() );
Expand Down
2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2642,7 +2642,7 @@ void W3DDisplay::drawImage(const Image* image, Int startX, Int startY,
}

// if we have raw texture data we will use it, otherwise we are referencing filenames
if (BitIsSet(image->getStatus(), IMAGE_STATUS_RAW_TEXTURE))
if (BitIsSet(image->getStatus(), IMAGE_STATUS_RAW_TEXTURE) && image->getRawTextureData() != nullptr)
m_2DRender->Set_Texture((TextureClass*)(image->getRawTextureData()));
else
m_2DRender->Set_Texture(image->getFilename().str());
Expand Down
Loading