Skip to content

Fix crash when failing to attach an item #597

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

Merged
Asdow merged 2 commits into from
May 6, 2026
Merged

Fix crash when failing to attach an item #597

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c9469c
Fix crash when failing an attachment via item desc popup callback
Asdow May 6, 2026
10400ba
Change mouse cursor if attachment attempt fails
Asdow May 6, 2026
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
20 changes: 18 additions & 2 deletions Tactical/Interface Items.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,13 +643,29 @@ void popupCallbackItem(INT16 itemId){
i++;p++;
}

OBJECTTYPE pObjTmp;
static OBJECTTYPE pObjTmp;
pObjTmp.initialize();

if( bestStack->RemoveObjectAtIndex(leastDamagedIndex, &pObjTmp) ){
gpItemPointer = &pObjTmp; // pick up the object (or stack)
DoAttachment((UINT8)gubPopupStatusIndex, guiPopupItemPos); // try to attach it
//gpItemPointer = NULL; // dont drop it!

// If attaching failed, change mouse cursor to item as we're still holding it
if ( gpItemPointer->exists() ) {
// Set mouse
guiExternVo = GetInterfaceGraphicForItem(&(Item[gpItemPointer->usItem]));
gusExternVoSubIndex = Item[gpItemPointer->usItem].ubGraphicNum;

MSYS_ChangeRegionCursor(&gMPanelRegion, EXTERN_CURSOR);
MSYS_SetCurrentCursor(EXTERN_CURSOR);
fMapInventoryItem = TRUE;
fTeamPanelDirty = TRUE;

//Dirty interface
fInterfacePanelDirty = DIRTYLEVEL2;

UpdateItemHatches();
}

gItemDescAttachmentPopups[giActiveAttachmentPopup]->hide();
RenderItemDescriptionBox();
Expand Down
Loading