From 814964a1007c6393aac4c6c5503d520e42334854 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Tue, 1 Jan 2019 23:32:16 -0800 Subject: [PATCH] Fix exception adding PCs --- .../java/com/limelight/computers/ComputerManagerService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/limelight/computers/ComputerManagerService.java b/app/src/main/java/com/limelight/computers/ComputerManagerService.java index d59e2f5e..3342ace1 100644 --- a/app/src/main/java/com/limelight/computers/ComputerManagerService.java +++ b/app/src/main/java/com/limelight/computers/ComputerManagerService.java @@ -461,7 +461,8 @@ public class ComputerManagerService extends Service { LimeLog.severe("Polling returned no UUID!"); return null; } - else if (!details.uuid.equals(newDetails.uuid)) { + // details.uuid can be null on initial PC add + else if (details.uuid != null && !details.uuid.equals(newDetails.uuid)) { // We got the wrong PC! LimeLog.info("Polling returned the wrong PC!"); return null;