Skip to content
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.

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

[6_1_x][TIMOB-24799] Fix issue where theme was being set as its parent #9135

Merged
merged 2 commits into from Jun 12, 2017

Conversation

ewanharris
Copy link
Collaborator

JIRA: https://jira.appcelerator.org/browse/TIMOB-24799

Backport of #9134

Bad things happen if a theme is a parent of itself, so we should prevent that

@ewanharris ewanharris changed the base branch from master to 6_1_X June 9, 2017 15:52
@ewanharris ewanharris changed the title [TIMOB-24799] Fix issue where theme was being set as its parent [6_1_x][TIMOB-24799] Fix issue where theme was being set as its parent Jun 9, 2017
@ewanharris ewanharris requested a review from cb1kenobi June 9, 2017 15:55
@lokeshchdhry
Copy link
Contributor

FR Passed.

Setting theme as in the tiapp.xml does not inherit itself & no error seen.

Ran the attached app in the ticket with the fix & no error/crash was seen.
Studio Ver: 4.9.0.201705302345
SDK Ver: 6.1.1 local build
OS Ver: 10.12.3
Xcode Ver: Xcode 8.3.3
Appc NPM: 4.2.9
Appc CLI: 6.2.2
Ti CLI Ver: 5.0.14
Alloy Ver: 1.9.11
Node Ver: 6.10.1
Java Ver: 1.8.0_101
Devices: ⇨ google Nexus 5 --- Android 6.0.1
⇨ google Pixel --- Android 7.1.1
Emulator: Android 4.4.2

@lokeshchdhry lokeshchdhry merged commit ac42a04 into tidev:6_1_X Jun 12, 2017
@lokeshchdhry
Copy link
Contributor

OOPS, merged accidentally before the CR. @garymathews or @cb1kenobi, can you please do a quick CR. Thanks.

@hansemannn
Copy link
Collaborator

hansemannn commented Jun 12, 2017

@lokeshchdhry master-PR passed the CR, so I think you are fine 😇.

@lokeshchdhry
Copy link
Contributor

@hansemannn , cool.

@ewanharris ewanharris deleted the TIMOB-24799_6_1_X branch August 31, 2021 09:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants