Skip to content

fix: don't let kill() short-circuit stop() #5033

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
connortechnology merged 1 commit into from
Aug 3, 2026
+12 −6
Merged

fix: don't let kill() short-circuit stop() #5033

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions web/js/MonitorStream.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,7 @@ function MonitorStream(monitorData) {
}
};

this.stop = function() {
this.stop = function(options = {}) {
manageEventListener.removeEventListener(this.handlerEventListener['killStream']);
manageEventListener.removeEventListener(this.handlerEventListener['playStream']);
if (manageEventListener.removeEventListener(this.handlerEventListener['volumechange']) == this.handlerEventListener['volumechange']) this.handlerEventListener['volumechange'] = null;
Expand Down Expand Up @@ -727,7 +727,7 @@ function MonitorStream(monitorData) {

if (-1 !== this.activePlayer.indexOf('zms')) {
// Icon: My current thought is to just tell zms to stop. Don't go to single.
if (this.started) this.streamCommand(CMD_STOP);
if (this.started && !options.skipStreamCommand) this.streamCommand(CMD_STOP);
} else if (-1 !== this.activePlayer.indexOf('go2rtc')) {
if (!(stream.wsState === WebSocket.CLOSED && stream.pcState === WebSocket.CLOSED)) {
try {
Expand Down Expand Up @@ -845,14 +845,20 @@ function MonitorStream(monitorData) {
stream.onload = null;

// this.stop tells zms to stop streaming, but the process remains. We need to turn the stream into an image.
if (this.started && (-1 !== this.activePlayer.indexOf('zms')) && this.connKey) {
const quit = this.started && (-1 !== this.activePlayer.indexOf('zms')) && this.connKey;
if (quit) {
// Make zms exit, sometimes zms doesn't receive SIGPIPE, so try to send QUIT
this.streamCommand(CMD_QUIT);
}
// Kill and stop share a lot of the same code... so just call stop.
// Don't clear started/connKey before this: stop() bails out early when
// !started, which would leave statusCmdTimer and streamCmdTimer running and
// activePlayer set. Tell it to skip CMD_STOP instead, because zms is already
// on its way out and the command would just error against a dead socket.
this.stop({skipStreamCommand: quit});
if (quit) {
this.streamCmdParms.connkey = this.statusCmdParms.connkey = this.connKey = null;
this.started = false;
}
// Kill and stop share a lot of the same code... so just call stop
this.stop();
};

this.restart = function(channelStream = "default", delay = 200) {
Expand Down
Loading