Bug fix : crash when edit the titleblock properties of an empty project (project without folio)

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4636 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2016-08-17 13:00:32 +00:00
parent 12477553a8
commit ea7780540e
3 changed files with 13 additions and 10 deletions

View File

@@ -145,19 +145,20 @@ void AutoNumberingDockWidget::setConductorActive(DiagramView* dv) {
void AutoNumberingDockWidget::setActive() {
if (projectview_!=NULL) {
//Conductor
QString conductor_autonum = projectview_->currentDiagram()->diagram()->conductorsAutonumName();
int conductor_index = ui->m_conductor_cb->findText(conductor_autonum);
ui->m_conductor_cb->setCurrentIndex(conductor_index);
//Conductor
if (projectview_->currentDiagram()) {
QString conductor_autonum = projectview_->currentDiagram()->diagram()->conductorsAutonumName();
int conductor_index = ui->m_conductor_cb->findText(conductor_autonum);
ui->m_conductor_cb->setCurrentIndex(conductor_index);
}
//Element
QString current_element_autonum = project_->elementCurrentAutoNum();
//Element
QString element_formula = project_->elementAutoNumFormula();
QString active_element_autonum = project_->elementAutoNumHash().key(element_formula);
int el_index = ui->m_element_cb->findText(active_element_autonum);
ui->m_element_cb->setCurrentIndex(el_index);
//Folio
//Folio
if (project_->defaultTitleBlockProperties().folio == "%autonum") {
QString page_autonum = project_->defaultTitleBlockProperties().auto_page_num;
int folio_index = ui->m_folio_cb->findText(page_autonum);