From bfba66878e4e62036fcbbc2c04b58c5dcb826a19 Mon Sep 17 00:00:00 2001
From: zeppi <jessopb@gmail.com>
Date: Wed, 18 Aug 2021 16:38:23 -0400
Subject: [PATCH 1/2] fix video dispose bug

---
 ui/component/app/view.jsx                     | 19 +++++++++++-
 .../viewers/videoViewer/internal/videojs.jsx  | 30 +++++++++----------
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/ui/component/app/view.jsx b/ui/component/app/view.jsx
index 4ab5d4fbf..aadc719e4 100644
--- a/ui/component/app/view.jsx
+++ b/ui/component/app/view.jsx
@@ -5,7 +5,7 @@ import { lazyImport } from 'util/lazyImport';
 import classnames from 'classnames';
 import analytics from 'analytics';
 import { buildURI, parseURI } from 'lbry-redux';
-import { SIMPLE_SITE } from 'config';
+import { SIMPLE_SITE, ENABLE_PREROLL_ADS } from 'config';
 import Router from 'component/router/index';
 import ReactModal from 'react-modal';
 import { openContextMenu } from 'util/context-menu';
@@ -325,6 +325,23 @@ function App(props: Props) {
     }
   }, [previousRewardApproved, isRewardApproved]);
 
+  // Load IMA3 SDK for aniview
+  // @if TARGET='web'
+  useEffect(() => {
+    if (ENABLE_PREROLL_ADS) {
+      const script = document.createElement('script');
+      script.src = `https://imasdk.googleapis.com/js/sdkloader/ima3.js`;
+      script.async = true;
+      // $FlowFixMe
+      document.body.appendChild(script);
+      return () => {
+        // $FlowFixMe
+        document.body.removeChild(script);
+      };
+    }
+  });
+  // @endif
+
   // @if TARGET='app'
   useEffect(() => {
     if (updatePreferences && getWalletSyncPref && readyForPrefs) {
diff --git a/ui/component/viewers/videoViewer/internal/videojs.jsx b/ui/component/viewers/videoViewer/internal/videojs.jsx
index d27bf7f1d..5f340751e 100644
--- a/ui/component/viewers/videoViewer/internal/videojs.jsx
+++ b/ui/component/viewers/videoViewer/internal/videojs.jsx
@@ -624,8 +624,8 @@ export default React.memo<Props>(function VideoJs(props: Props) {
 
       const player = playerRef.current;
       if (player) {
-        window.player = undefined;
         player.dispose();
+        window.player = undefined;
       }
     };
   }, [isAudio]);
@@ -664,21 +664,19 @@ export default React.memo<Props>(function VideoJs(props: Props) {
     });
   }, [source, reload]);
 
-  // Load IMA3 SDK for aniview
-  // @if TARGET='web'
-  useEffect(() => {
-    const script = document.createElement('script');
-    script.src = `https://imasdk.googleapis.com/js/sdkloader/ima3.js`;
-    script.async = true;
-    // $FlowFixMe
-    document.body.appendChild(script);
-
-    return () => {
-      // $FlowFixMe
-      document.body.removeChild(script);
-    };
-  });
-  // @endif
+  // // Load IMA3 SDK for aniview
+  // useEffect(() => {
+  //   const script = document.createElement('script');
+  //   script.src = `https://imasdk.googleapis.com/js/sdkloader/ima3.js`;
+  //   script.async = true;
+  //   // $FlowFixMe
+  //   document.body.appendChild(script);
+  //
+  //   return () => {
+  //     // $FlowFixMe
+  //     document.body.removeChild(script);
+  //   };
+  // });
 
   return (
     // $FlowFixMe
-- 
2.45.3


From cc75771d25f6fe6340eb37dd177c27d1703bcc1d Mon Sep 17 00:00:00 2001
From: zeppi <jessopb@gmail.com>
Date: Wed, 18 Aug 2021 19:21:19 -0400
Subject: [PATCH 2/2] remove commented

---
 .../viewers/videoViewer/internal/videojs.jsx       | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/ui/component/viewers/videoViewer/internal/videojs.jsx b/ui/component/viewers/videoViewer/internal/videojs.jsx
index 5f340751e..73ee97457 100644
--- a/ui/component/viewers/videoViewer/internal/videojs.jsx
+++ b/ui/component/viewers/videoViewer/internal/videojs.jsx
@@ -664,20 +664,6 @@ export default React.memo<Props>(function VideoJs(props: Props) {
     });
   }, [source, reload]);
 
-  // // Load IMA3 SDK for aniview
-  // useEffect(() => {
-  //   const script = document.createElement('script');
-  //   script.src = `https://imasdk.googleapis.com/js/sdkloader/ima3.js`;
-  //   script.async = true;
-  //   // $FlowFixMe
-  //   document.body.appendChild(script);
-  //
-  //   return () => {
-  //     // $FlowFixMe
-  //     document.body.removeChild(script);
-  //   };
-  // });
-
   return (
     // $FlowFixMe
     <div className={classnames('video-js-parent', { 'video-js-parent--ios': IS_IOS })} ref={containerRef}>
-- 
2.45.3