Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Merge develop 9.0 07.10.2019 - #7187

Merged
livecodepanos merged 6 commits into
livecode:develop-9.5from
livecodepanos:merge-develop-9.0-07.10.2019
Oct 7, 2019
Merged

Merge develop 9.0 07.10.2019#7187
livecodepanos merged 6 commits into
livecode:develop-9.5from
livecodepanos:merge-develop-9.0-07.10.2019

Conversation

@livecodepanos

@livecodepanos livecodepanos commented Oct 7, 2019

Copy link
Copy Markdown
Contributor

Trivial conflict in ide submodule ptr

livecodepanos and others added 6 commits September 15, 2019 23:35
This patch adds a 'freeze' count to the deleted object pool logic. When the current
pool is frozen, no new pools will be created until it is thawed again. This means
that all objects that are deleted during that period are accumulated in the frozen
pool.

This ability is used inside MCB_prepmessage, which is the handler which causes the
engine to enter debug mode and send a message. Doing this prevents corruption of
the deleted object pools stack which appears to occur when the script editor
manipulates menus in the context of a debug-related message.

As the use of freezing the current object pool is only used in this one place it
has no effect on normal running code, only on code which runs in the context of
a debug-related message.
[[ Bug 22130 ]] Disable deleted object pool creation whilst debugging
….5-7.10.2019

Merge release 9.0.5 7.10.2019
@livecodepanos livecodepanos added this to the 9.5.1-rc-1 milestone Oct 7, 2019
@livecodepanos

Copy link
Copy Markdown
Contributor Author

Almost clean merge, so self-review:

@livecode-vulcan review ok b3ac26b

@livecode-vulcan

Copy link
Copy Markdown
Contributor

💙 review by @livecodepanos ok b3ac26b

livecode-vulcan added a commit that referenced this pull request Oct 7, 2019
….10.2019

Merge develop 9.0 07.10.2019

Trivial conflict in `ide` submodule ptr
@livecode-vulcan

Copy link
Copy Markdown
Contributor

😎 test success b3ac26b

  • try-community-armv6-android-sdk26_ndk16r15: success
  • try-community-armv7-android-ndk16r15: success
  • try-community-arm64-android-ndk16r15: success
  • try-community-x86-android-ndk16r15: success
  • try-community-x86_64-android-ndk16r15: success
  • try-community-js-emscripten-sdk1.35: success
  • try-community-universal-ios-iphoneos13.1: success
  • try-community-universal-ios-iphonesimulator13.1: success
  • try-community-universal-mac-macosx10.9: success
  • try-community-x86-linux-debian8: success
  • try-community-x86_64-linux-debian8: success
  • try-community-x86-win32: success
  • try-community-x86_64-win32: success

@livecodepanos
livecodepanos merged commit bf225b0 into livecode:develop-9.5 Oct 7, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants