From fafd9268e79aeb3db473c4908fe661e4afe74483 Mon Sep 17 00:00:00 2001 From: 0xb00bface <0xboobface@gmail.com> Date: Tue, 21 Dec 2021 22:09:09 +0100 Subject: [PATCH] Use online state in isOnline if it is available --- .../src/main/java/ctbrec/sites/mfc/MyFreeCamsModel.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/ctbrec/sites/mfc/MyFreeCamsModel.java b/common/src/main/java/ctbrec/sites/mfc/MyFreeCamsModel.java index 40d29070..a34f8cda 100644 --- a/common/src/main/java/ctbrec/sites/mfc/MyFreeCamsModel.java +++ b/common/src/main/java/ctbrec/sites/mfc/MyFreeCamsModel.java @@ -65,6 +65,8 @@ public class MyFreeCamsModel extends AbstractModel { if (online) { if (sessionState == null) { LOG.warn("MFC model {} [{}] seems to be online but a SessionState could not be found", getName(), getUid()); + } else { + return state == ctbrec.sites.mfc.State.ONLINE; } } else { state = ctbrec.sites.mfc.State.OFFLINE; @@ -91,8 +93,7 @@ public class MyFreeCamsModel extends AbstractModel { } switch(state) { - case ONLINE: - case RECORDING: + case ONLINE, RECORDING: return ctbrec.Model.State.ONLINE; case AWAY: return ctbrec.Model.State.AWAY; @@ -100,9 +101,7 @@ public class MyFreeCamsModel extends AbstractModel { return ctbrec.Model.State.PRIVATE; case GROUP_SHOW: return ctbrec.Model.State.GROUP; - case OFFLINE: - case CAMOFF: - case UNKNOWN: + case OFFLINE, CAMOFF, UNKNOWN: return ctbrec.Model.State.OFFLINE; default: LOG.debug("State {} is not mapped", this.state);