OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 02:27:40 -04:00
Code Releases Activity

Fix crash from plMouseDevice::HideCursor if it is called before cursor is created

Browse Source
This commit is contained in:
Adam Johnson
2022-04-06 19:46:00 -05:00
committed by ZarothYe
parent 33bbc490be
commit 3489e04463
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp
View File

@ -481,8 +481,8 @@ void plMouseDevice::SetCursorY(hsScalar y)
void plMouseDevice::HideCursor(hsBool override) void plMouseDevice::HideCursor(hsBool override)
{ {
if( fInstance->fCursor != nil ) if (fInstance && fInstance->fCursor)
fInstance->fCursor->SetVisible( false ); fInstance->fCursor->SetVisible(false);
plMouseDevice::bCursorOverride = (override != 0); plMouseDevice::bCursorOverride = (override != 0);
plMouseDevice::bCursorHidden = true; plMouseDevice::bCursorHidden = true;
@ -499,9 +499,11 @@ void plMouseDevice::ShowCursor(hsBool override)
plMouseDevice::bCursorHidden = false; plMouseDevice::bCursorHidden = false;
plMouseDevice::bCursorOverride = false; plMouseDevice::bCursorOverride = false;
if( fInstance->fCursor == nil ) if (fInstance) {
fInstance->CreateCursor( fInstance->fCursorID ); if (!fInstance->fCursor)
fInstance->fCursor->SetVisible( true ); fInstance->CreateCursor(fInstance->fCursorID);
fInstance->fCursor->SetVisible(true);
}
} }
void plMouseDevice::NewCursor(char* cursor) void plMouseDevice::NewCursor(char* cursor)