fix: avoid uiTextDisplayer.destroy crashing if called more than once (#…

…6022)

AUTHORS

@@ -21,6 +21,7 @@ Alugha GmbH <*@alugha.com>
 Alvaro Velad Galvan <ladvan91@hotmail.com>
 Amila Sampath <lucksy@gmail.com>
 Anthony Stansbridge <github@anthonystansbridge.co.uk>
+Antonio Diaz Correa <hello@antoniodiaz.me>
 Armand Zangue <armand.zangue@gmail.com>
 Benjamin Wallberg <me@bwallberg.com>
 Bonnier Broadcasting <*@bonnierbroadcasting.com>

CONTRIBUTORS

@@ -32,6 +32,7 @@ Alvaro Velad Galvan <ladvan91@hotmail.com>
 Amila Sampath <lucksy@gmail.com>
 Andy Hochhaus <ahochhaus@samegoal.com>
 Anthony Stansbridge <github@anthonystansbridge.co.uk>
+Antonio Diaz Correa <hello@antoniodiaz.me>
 Armand Zangue <armand.zangue@gmail.com>
 Ashutosh Kumar Mukhiya <ashukm4@gmail.com>
 Benjamin Wallberg <benjamin.wallberg@bonnierbroadcasting.com>

lib/text/ui_text_displayer.js

@@ -154,6 +154,11 @@ shaka.text.UITextDisplayer = class {
    * @export
    */
   destroy() {
+    // Return resolved promise if destroy() has been called.
+    if (!this.textContainer_) {
+      return Promise.resolve();
+    }
+
     // Remove the text container element from the UI.
     this.videoContainer_.removeChild(this.textContainer_);
     this.textContainer_ = null;
@@ -176,6 +181,8 @@ shaka.text.UITextDisplayer = class {
       this.resizeObserver_.disconnect();
       this.resizeObserver_ = null;
     }
+
+    return Promise.resolve();
   }
 
 

test/text/ui_text_displayer_unit.js

@@ -605,4 +605,13 @@ describe('UITextDisplayer', () => {
         (e) => e.nodeType == Node.ELEMENT_NODE);
     expect(childrenOfTwo.length).toBe(3);
   });
+
+  it('textDisplayer does not crash if destroy is called more than once', () => {
+    expect(videoContainer.childNodes.length).toBe(1);
+
+    textDisplayer.destroy();
+    textDisplayer.destroy();
+
+    expect(videoContainer.childNodes.length).toBe(0);
+  });
 });