Skip to content

Bug fix, customLoadedTriggers with preloaded mode - #18

Merged
mcpiroman merged 4 commits into
mcpiroman:masterfrom
rogerbarton:fix-custom-triggers-preloaded
May 1, 2020
Merged

Bug fix, customLoadedTriggers with preloaded mode#18
mcpiroman merged 4 commits into
mcpiroman:masterfrom
rogerbarton:fix-custom-triggers-preloaded

Conversation

@rogerbarton

@rogerbarton rogerbarton commented Apr 24, 2020

Copy link
Copy Markdown
Contributor
  1. The loaded trigger is now called after all mocked methods have been loaded for preloaded mode. This allows using a native method inside the callback, such as a initialize function.

  2. Swapped ordering so UnityPluginLoad() (from LowLevelPluginManager.OnDllLoaded(dll)) is called before the trigger. This is unrelated to the bug but makes more sense.

The loaded trigger is now called after all mocked methods have been loaded for preloaded mode. This allows using a native method inside the callback, such as a native initialize function.
@mcpiroman

Copy link
Copy Markdown
Owner

One thing I'd like is to have that commented in the code, but otherwise yup, it makes sense to me.

@mcpiroman

Copy link
Copy Markdown
Owner

Oh well, I meant the comments in the actual new code, but that's also useful ;)

@mcpiroman

Copy link
Copy Markdown
Owner

Looks like some conflicts with comments (I can't merge that because that's your repo).

@rogerbarton

Copy link
Copy Markdown
Contributor Author

Yep im just resolving them right now

@mcpiroman
mcpiroman merged commit edc68d8 into mcpiroman:master May 1, 2020
@rogerbarton
rogerbarton deleted the fix-custom-triggers-preloaded branch May 1, 2020 19:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants