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.

Sign up for GitHub

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

Jump to bottom

[6_1_X][TIMOB-24839] Fix Ti.UI.Window object release #9146

Merged
merged 2 commits into from
Jun 19, 2017
Merged

[6_1_X][TIMOB-24839] Fix Ti.UI.Window object release #9146

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66b6b03
[TIMOB-24839] Fix Ti.UI.Window object release
Jun 16, 2017
d3ddbe4
Merge branch '6_1_X' into TIMOB-24839_6_1_X
ssjsamir Jun 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 11 additions & 0 deletions android/titanium/src/java/org/appcelerator/kroll/KrollProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1294,6 +1294,17 @@ public void release()
}
}

/**
* Only release kroll, but maintain instance
* @module.api
*/
public void releaseKroll()
{
if (krollObject != null) {
krollObject.release();
}
}

// For subclasses to override
@Kroll.method @Kroll.getProperty
public String getApiName()
Expand Down
2 changes: 1 addition & 1 deletion android/titanium/src/java/org/appcelerator/titanium/TiBaseActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1579,7 +1579,7 @@ protected void onDestroy()
window.closeFromActivity(isFinishing);
window.releaseViews();
window.removeAllChildren();
window.release();
window.releaseKroll();
window = null;
}

Expand Down