From 3aa7c4f8f31440b4145ef5799d2d7acd7c4a72d8 Mon Sep 17 00:00:00 2001
From: Elio Milite <e.milite4@studenti.unisa.it>
Date: Thu, 27 May 2021 16:12:23 +0200
Subject: [PATCH] fix catchup

---
 src/components/Live/Fullscreen.js | 8 ++++----
 src/components/Player/Player.js   | 4 ++--
 src/other/generate-url.js         | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/Live/Fullscreen.js b/src/components/Live/Fullscreen.js
index 49696d3..ca5fb38 100644
--- a/src/components/Live/Fullscreen.js
+++ b/src/components/Live/Fullscreen.js
@@ -120,10 +120,10 @@ const FullscreenMag = ({externalShow, cTitle, cDesc, cDuration}) => {
     } : false);
 
     
-    const title = epgNow ? epgNow.title : ""
-    const description = epgNow ? epgNow.description : ""
-    const start = epgNow ? dateFormat(new Date(epgNow.start), h24Format) : ""
-    const stop = epgNow ? dateFormat(new Date(epgNow.end), h24Format) : ""
+    const title = epgNow && epgNow.start ? epgNow.title : ""
+    const description = epgNow && epgNow.start ? epgNow.description : ""
+    const start = epgNow && epgNow.start ? dateFormat(new Date(epgNow.start), h24Format) : ""
+    const stop = epgNow && epgNow.start ? dateFormat(new Date(epgNow.end), h24Format) : ""
 
     /*const remoteController = (event) => {
         if(event.keyCode === 27 || event.keyCode === 8){
diff --git a/src/components/Player/Player.js b/src/components/Player/Player.js
index 0e3fc10..8847792 100644
--- a/src/components/Player/Player.js
+++ b/src/components/Player/Player.js
@@ -1,7 +1,7 @@
 import React, {useRef,useState,useEffect} from "react"
 import ReactPlayer from 'react-player'
 import {useSelector} from "react-redux"
-import Fullscreen from "../Live/Fullscreen"
+import Fullscreen from "../Live/Fullscreen.js"
 import Button from "./Buttons/Button"
 import VolumeButton from "./Buttons/VolumeButton"
 import PiPButton from "./Buttons/PiPButton"
@@ -44,7 +44,7 @@ width: 100%;
 overflow-x: hidden;
 background-color: transparent;
 position: absolute;
-z-index: 100000000000000000;
+z-index: 5;
 top: 0;
 left: 0;
 
diff --git a/src/other/generate-url.js b/src/other/generate-url.js
index 727fcff..69c5480 100644
--- a/src/other/generate-url.js
+++ b/src/other/generate-url.js
@@ -26,7 +26,7 @@ export function convertTsToM3u8(ip) {
 export function catchupUrlGenerator (ip,time, duration){
     let url = ip;
     time = timeConverter(time)
-    url = url.replace.replace("/live/","/").replace(/\.ts|\.m3u8/g,"")
+    url = url.replace("/live/","/").replace(/\.ts|\.m3u8/g,"")
     const splitted = url.split("/");
 
     const id = splitted[splitted.length-1];