mirror of
https://github.com/baldurk/renderdoc.git
synced 2026-05-29 13:20:54 +00:00
Don't recursively call IsSupported from GetFriendlyName (and vice-versa)
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user