lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-06 01:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the invalid pointer dereference bug in the combo widget

Browse Source
This commit is contained in:
Artur Wojcik
2022-11-17 16:13:50 +01:00
committed by Baldur Karlsson
parent 789a2a131c
commit 3624d6e30b
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/MiniQtHelper.cpp
+11 -4
View File
@@ -697,8 +697,11 @@ void MiniQtHelper::SetComboOptions(QWidget *combo, const rdcarray<rdcstr> &optio
for(const rdcstr &o : options)
texts << o;
comb->clear();
comb->addItems(texts);
if(comb)
{
comb->clear();
comb->addItems(texts);
}
}
size_t MiniQtHelper::GetComboCount(QWidget *combo)
@@ -707,7 +710,10 @@ size_t MiniQtHelper::GetComboCount(QWidget *combo)
return 0;
const QComboBox *comb = qobject_cast<const QComboBox *>(combo);
return comb->count();
if(comb)
return comb->count();
return 0;
}
void MiniQtHelper::SelectComboOption(QWidget *combo, const rdcstr &option)
@@ -716,5 +722,6 @@ void MiniQtHelper::SelectComboOption(QWidget *combo, const rdcstr &option)
return;
QComboBox *comb = qobject_cast<QComboBox *>(combo);
comb->setCurrentText(option);
if(comb)
comb->setCurrentText(option);
}