Don't recursively call IsSupported from GetFriendlyName (and vice-versa)

This commit is contained in:
baldurk
2019-10-23 17:09:26 +01:00
parent a08455c4fb
commit a3af488927
2 changed files with 2 additions and 3 deletions
+2
View File
@@ -762,6 +762,8 @@ struct AndroidController : public IDeviceProtocolHandler
Device dev;
dev.active = true;
dev.name = Android::GetFriendlyName(d);
if(!Android::IsSupported(d))
dev.name += " - (Android 5.x)";
dev.portbase =
uint16_t(RenderDoc_ForwardPortBase +
RenderDoc::Inst().GetForwardedPortSlot() * RenderDoc_ForwardPortStride);
-3
View File
@@ -256,9 +256,6 @@ rdcstr GetFriendlyName(const rdcstr &deviceID)
else if(!manuf.empty() && !model.empty())
combined = manuf + " " + model;
if(!IsSupported(deviceID))
combined += " - (Android 5.x)";
return combined;
}