Merge pull request #260 from rdkcentral/fix/close-cleanup

erikhaandrikman · web-flow · commit 733603cf5c91 · 2021-08-30T22:56:50.000+02:00
Fix/close cleanup
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## v4.6.1
+
+*30 aug 2021*
+
+- Fixed cleanup after closing an App
 ## v4.6.0
 
 *16 aug 2021*
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## v4.6.1
+
+*30 aug 2021*
+
+- Fixed cleanup after closing an App
 ## v4.6.0
 
 *16 aug 2021*
diff --git a/docs/package.json b/docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lightningjs/sdk",
-  "version": "4.5.0",
+  "version": "4.6.1",
   "license": "Apache-2.0",
   "scripts": {
     "postinstall": "node ./scripts/postinstall.js",
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lightningjs/sdk",
-  "version": "4.6.0",
+  "version": "4.6.1",
   "license": "Apache-2.0",
   "scripts": {
     "postinstall": "node ./scripts/postinstall.js",
diff --git a/src/Application/index.js b/src/Application/index.js
@@ -160,10 +160,7 @@ export default function(App, appData, platformSettings) {
     }
 
     closeApp() {
-      Log.info('Closing App')
-
-      Settings.clearSubscribers()
-      Registry.clear()
+      Log.info('Signaling App Close')
 
       if (platformSettings.onClose && typeof platformSettings.onClose === 'function') {
         platformSettings.onClose(...arguments)
@@ -174,6 +171,10 @@ export default function(App, appData, platformSettings) {
 
     close() {
       Log.info('Closing App')
+
+      Settings.clearSubscribers()
+      Registry.clear()
+
       this.childList.remove(this.tag('App'))
       this.cleanupFonts()
       // force texture garbage collect

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@lightningjs/sdk",`
`3`		`- "version": "4.5.0",`
	`3`	`+ "version": "4.6.1",`
`4`	`4`	`"license": "Apache-2.0",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"postinstall": "node ./scripts/postinstall.js",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@lightningjs/sdk",`
`3`		`- "version": "4.6.0",`
	`3`	`+ "version": "4.6.1",`
`4`	`4`	`"license": "Apache-2.0",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"postinstall": "node ./scripts/postinstall.js",`