mirror of
https://github.com/openmhz/trunk-server.git
synced 2026-11-12 08:47:40 -05:00
patching up Live
This commit is contained in:
@@ -54,7 +54,6 @@ function CallPlayer(props) {
|
||||
const stickyRef = useRef(); // lets us get the Y Scroll offset for the Call List
|
||||
const positionRef = useRef(); // lets us get the Y Scroll offset for the Call List
|
||||
const shouldPlayAddCallRef = useRef(); // we need to do this to make the current value of isPlaying available in the socket message callback
|
||||
const live = useSelector((state) => state.callPlayer.live);
|
||||
shouldPlayAddCallRef.current = (!isPlaying && autoPlay) ? true : false;
|
||||
|
||||
let currentCallId = false;
|
||||
@@ -96,7 +95,7 @@ function CallPlayer(props) {
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
if (!live && loadNewerInView && callsData && (callsData.ids.length > 0)) {
|
||||
if (loadNewerInView && callsData && (callsData.ids.length > 0)) {
|
||||
handleNewer();
|
||||
}
|
||||
}, [loadNewerInView]);
|
||||
|
||||
@@ -298,12 +298,6 @@ useLayoutEffect(() => {
|
||||
useEffect(() => {
|
||||
socket.on('connect', () => {
|
||||
console.log("Socket Connect");
|
||||
setLive( (live) => {
|
||||
if (live) {
|
||||
//startSocket();
|
||||
}
|
||||
})
|
||||
|
||||
setIsConnected(true);
|
||||
});
|
||||
|
||||
@@ -314,11 +308,7 @@ useLayoutEffect(() => {
|
||||
|
||||
socket.on('reconnect', (attempts) => {
|
||||
console.log("Socket Reconnected after attempts: " + attempts); // true
|
||||
setLive( (live) => {
|
||||
if (live) {
|
||||
//startSocket();
|
||||
}
|
||||
})
|
||||
setIsConnected(true);
|
||||
})
|
||||
|
||||
socket.on("new message", handleSocketMessage);
|
||||
@@ -332,10 +322,10 @@ useLayoutEffect(() => {
|
||||
|
||||
useEffect(() => {
|
||||
dispatch(getCalls({}));
|
||||
if (live) {
|
||||
if (live && isConnected) {
|
||||
startSocket();
|
||||
}
|
||||
}, [shortName, filterGroupId, filterTalkgroups, filterType, filterDate, filterStarred])
|
||||
}, [shortName, filterGroupId, filterTalkgroups, filterType, filterDate, filterStarred, isConnected])
|
||||
|
||||
|
||||
// Update the Browser URI when any relevant values change
|
||||
|
||||
Reference in New Issue
Block a user