Merge pull request #752 from LeeLeahy2/fix-749

nseidle · web-flow · commit 31d301f2bc3d · 2024-01-19T15:04:01.000-07:00
Network: Fix issue 749, networkUserClose failed to get network
diff --git a/Firmware/RTK_Surveyor/Network.ino b/Firmware/RTK_Surveyor/Network.ino
@@ -536,7 +536,8 @@ NETWORK_DATA * networkGetUserNetwork(NETWORK_USER user)
     for (networkType = 0; networkType < NETWORK_TYPE_MAX; networkType++)
     {
         network = networkGet(networkType, false);
-        if (network && (network->activeUsers & userMask))
+        if (network && ((network->activeUsers & userMask)
+                        || (network->userOpens & userMask)))
             return network;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -536,7 +536,8 @@ NETWORK_DATA * networkGetUserNetwork(NETWORK_USER user)`
`536`	`536`	`for (networkType = 0; networkType < NETWORK_TYPE_MAX; networkType++)`
`537`	`537`	`{`
`538`	`538`	`network = networkGet(networkType, false);`
`539`		`- if (network && (network->activeUsers & userMask))`
	`539`	`+ if (network && ((network->activeUsers & userMask)`
	`540`	`+ \|\| (network->userOpens & userMask)))`
`540`	`541`	`return network;`
`541`	`542`	`}`
`542`	`543`