avm1: Fix regression with action_get_url_2 and MovieClip without DisplayObject#23288
Draft
evilpie wants to merge 2 commits intoruffle-rs:masterfrom
Draft
avm1: Fix regression with action_get_url_2 and MovieClip without DisplayObject#23288evilpie wants to merge 2 commits intoruffle-rs:masterfrom
evilpie wants to merge 2 commits intoruffle-rs:masterfrom
Conversation
SuchAFuriousDeath
approved these changes
Mar 19, 2026
Member
|
Having a test would be nice. Otherwise we'll regress it again in the future. |
Member
|
Also, see https://discord.com/channels/610531541889581066/1018988628380241931/1457721092184735917 for discussion about this. |
Collaborator
Author
|
While the new behavior did cause the game to break, the new behavior might actual match Flash? This logs nothing for me in Flash. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #22674
This was a regression introduced in #22221.
Before:
ruffle/core/src/avm1/activation.rs
Lines 1256 to 1261 in 9b3d688
After:
ruffle/core/src/avm1/activation.rs
Lines 1217 to 1219 in c6e0cb0
The code is subtly different. Before, we used
Noneif the MovieClip didn't have a DisplayObject, but afterwards, we fell through to theelseblock./cc @moulins