Skip to content

Commit 360e72c

Browse files
committed
Merge pull request livecode#3553 from livecodeali/bugfix-16747
[[ Bug 16747 ]] Revert 'the target' and long id/name resolution to previous behavior
2 parents 93218ae + b21317d commit 360e72c

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

docs/notes/bugfix-16747.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Changing card while DG is scrolling causes error

engine/src/exec-engine.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1189,7 +1189,8 @@ void MCEngineExecDispatch(MCExecContext& ctxt, int p_handler_type, MCNameRef p_m
11891189
// Retarget this stack and the target to be relative to the target object
11901190
MCdefaultstackptr = t_this_stack;
11911191
MCtargetptr = t_object;
1192-
1192+
MCtargetptr . part_id = 0;
1193+
11931194
// MW-2012-10-30: [[ Bug 10478 ]] Turn off lockMessages before dispatch.
11941195
Boolean t_old_lock;
11951196
t_old_lock = MClockmessages;

engine/src/object.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2386,9 +2386,9 @@ bool MCObject::getnameproperty(Properties which, uint32_t p_part_id, MCValueRef&
23862386
if (parent != NULL)
23872387
{
23882388
MCObject *t_parent_object;
2389-
if (parent -> gettype() == CT_CARD)
2390-
t_parent_object = getcard(p_part_id);
2391-
else
2389+
// if (parent -> gettype() == CT_CARD)
2390+
// t_parent_object = getcard(p_part_id);
2391+
// else
23922392
t_parent_object = parent;
23932393

23942394
MCAutoValueRef t_parent;

0 commit comments

Comments
 (0)