diff --git a/RedPandaIDE/debugger.cpp b/RedPandaIDE/debugger.cpp index 84dab777..d81f5239 100644 --- a/RedPandaIDE/debugger.cpp +++ b/RedPandaIDE/debugger.cpp @@ -1217,9 +1217,9 @@ void DebugReader::processWatchOutput(PWatchVar watchVar) parentVar = newVar; } } else if (nodeText.startsWith('}')) { // end of struct, change parent - if (parentVar->parent!=nullptr) { - parentVar = std::shared_ptr(parentVar->parent); - } + if (parentVar->parent!=nullptr) { + parentVar = std::shared_ptr(parentVar->parent); + } } else { // next parent member/child if (parentVar->text.isEmpty()) { // root node, replace text only parentVar->text = nodeText; diff --git a/RedPandaIDE/settingsdialog/editormiscwidget.cpp b/RedPandaIDE/settingsdialog/editormiscwidget.cpp index 09f9b539..2707616b 100644 --- a/RedPandaIDE/settingsdialog/editormiscwidget.cpp +++ b/RedPandaIDE/settingsdialog/editormiscwidget.cpp @@ -19,7 +19,11 @@ void EditorMiscWidget::doLoad() { ui->chkReadonlySystemHeaders->setChecked(pSettings->editor().readOnlySytemHeader()); ui->chkLoadLastFiles->setChecked(pSettings->editor().autoLoadLastFiles()); - ui->rbCppFile->setChecked(pSettings->editor().defaultFileCpp()); + if (pSettings->editor().defaultFileCpp()) { + ui->rbCppFile->setChecked(true); + } else { + ui->rbCFile->setChecked(true); + } } void EditorMiscWidget::doSave()