Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 11:41:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #15968 from annabrewer/android-crash-fix

Browse source 
BUGZ-996: Android app crashes on startup
This commit is contained in:
Shannon Romano 2019-07-24 09:33:50 -07:00 committed by GitHub
commit a8842bf521
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/platform/src/platform/backend/PlatformInstance.cpp
View file

@ -107,7 +107,8 @@ void Instance::enumerateNics() {
json Instance::getCPU(int index) { json Instance::getCPU(int index) {
assert(index <(int) _cpus.size()); assert(index <(int) _cpus.size());
if (index >= (int)_cpus.size())
if (index < 0 || (int) _cpus.size() <= index)
return json(); return json();
return _cpus.at(index); return _cpus.at(index);
@ -116,7 +117,7 @@ json Instance::getCPU(int index) {
json Instance::getGPU(int index) { json Instance::getGPU(int index) {
assert(index <(int) _gpus.size()); assert(index <(int) _gpus.size());
if (index >=(int) _gpus.size()) if (index < 0 || (int) _gpus.size() <= index)
return json(); return json();
return _gpus.at(index); return _gpus.at(index);
@ -126,7 +127,7 @@ json Instance::getGPU(int index) {
json Instance::getDisplay(int index) { json Instance::getDisplay(int index) {
assert(index <(int) _displays.size()); assert(index <(int) _displays.size());
if (index >=(int) _displays.size()) if (index < 0 || (int) _displays.size() <= index)
return json(); return json();
return _displays.at(index); return _displays.at(index);