Merge disconnect conditions

Author: pennam

src/ArduinoIoTCloudTCP.cpp

@@ -444,12 +444,7 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_CheckDeviceConfig()
 
 ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_SubscribeThingTopics()
 {
-  if (!_mqttClient.connected())
-  {
-    return State::Disconnect;
-  }
-
-  if (_thing_id_property->isDifferentFromCloud())
+  if (!_mqttClient.connected() || _thing_id_property->isDifferentFromCloud())
   {
     return State::Disconnect;
   }
@@ -490,12 +485,7 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_SubscribeThingTopics()
 
 ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_RequestLastValues()
 {
-  if (!_mqttClient.connected())
-  {
-    return State::Disconnect;
-  }
-
-  if (_thing_id_property->isDifferentFromCloud())
+  if (!_mqttClient.connected() || _thing_id_property->isDifferentFromCloud())
   {
     return State::Disconnect;
   }