From 72064eb55b4908b2a66972d93c758e7f8e722adc Mon Sep 17 00:00:00 2001 From: 0xboobface <0xboobface@gmail.com> Date: Sat, 24 Nov 2018 15:20:45 +0100 Subject: [PATCH] Fix possible NPE in getStreamUrl --- common/src/main/java/ctbrec/sites/mfc/MyFreeCamsClient.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/ctbrec/sites/mfc/MyFreeCamsClient.java b/common/src/main/java/ctbrec/sites/mfc/MyFreeCamsClient.java index 04c168c4..c07c5afe 100644 --- a/common/src/main/java/ctbrec/sites/mfc/MyFreeCamsClient.java +++ b/common/src/main/java/ctbrec/sites/mfc/MyFreeCamsClient.java @@ -538,8 +538,8 @@ public class MyFreeCamsClient { } public String getStreamUrl(SessionState state) { - Integer camserv = state.getU().getCamserv(); - if(camserv != null) { + Integer camserv = Optional.ofNullable(state.getU()).map(u -> u.getCamserv()).orElse(-1); + if(camserv != null && camserv != -1) { int userChannel = 100000000 + state.getUid(); String streamUrl = ""; String phase = state.getU().getPhase() != null ? state.getU().getPhase() : "z";