From 95ea88e93291b55552043ffde31cfedad252ed62 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Thu, 26 Feb 2015 15:11:46 -0500
Subject: [PATCH] Only replace the MAC address if the existing one is non-null

---
 .../java/com/limelight/computers/ComputerManagerService.java    | 2 +-
 1 file changed, 1 insertion(+), 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 a9c0873a..652d2c43 100644
--- a/app/src/main/java/com/limelight/computers/ComputerManagerService.java
+++ b/app/src/main/java/com/limelight/computers/ComputerManagerService.java
@@ -497,7 +497,7 @@ public class ComputerManagerService extends Service {
         details.update(polledDetails);
 
         // If the new MAC address is empty, restore the old one (workaround for GFE bug)
-        if (details.macAddress.equals("00:00:00:00:00:00")) {
+        if (details.macAddress.equals("00:00:00:00:00:00") && savedMacAddress != null) {
             LimeLog.info("MAC address was empty; using existing value: "+savedMacAddress);
             details.macAddress = savedMacAddress;
         }