From 5d49b9b5d66251e2b8dbab8e1d23c1fd8fc08b10 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Wed, 18 Sep 2013 08:04:12 -0700
Subject: [PATCH] oops: don't default to clearing relayid

---
 xwords4/relay/cref.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/xwords4/relay/cref.cpp b/xwords4/relay/cref.cpp
index b28e833c3..3c16b2be9 100644
--- a/xwords4/relay/cref.cpp
+++ b/xwords4/relay/cref.cpp
@@ -946,7 +946,7 @@ CookieRef::increasePlayerCounts( CRefEvent* evt, bool reconn, HostID* hidp,
         DevIDType devIDType = evt->u.con.devID->m_devIDType;
         // does client support devID
         if ( ID_TYPE_RELAY == devIDType ) { 
-            // do nothing; it's registered already
+            devID = evt->u.con.devID->asRelayID();
         } else if ( ID_TYPE_NONE != devIDType ) { 
             if ( reconn     // should have a relay id; can we look it up?
                  && DBMgr::Get()->FindRelayIDFor( ConnName(), evt->u.con.srcID, 
@@ -956,9 +956,9 @@ CookieRef::increasePlayerCounts( CRefEvent* evt, bool reconn, HostID* hidp,
             } else {
                 devID = DBMgr::Get()->RegisterDevice( evt->u.con.devID );
             }
-            if ( addr->isUDP() ) {
-                DevMgr::Get()->rememberDevice( devID, addr );
-            }
+        }
+        if ( addr->isUDP() ) {
+            DevMgr::Get()->rememberDevice( devID, addr );
         }
         *devIDp = devID;
     }