Resoved issue #522. Error: Crash in new file after clicking 'OK' in Point From

Distance And Angle tool.

--HG--
branch : develop
This commit is contained in:
Valentina Zhuravska 2016-07-02 08:10:09 +03:00
parent 49258cac8c
commit 9d19ac14c5

View File

@ -143,7 +143,10 @@ MainWindow::MainWindow(QWidget *parent)
connect(doc, &VPattern::CheckLayout, [this](){ connect(doc, &VPattern::CheckLayout, [this](){
if (pattern->DataDetails()->count() == 0) if (pattern->DataDetails()->count() == 0)
{ {
ActionDraw(true); if(not ui->actionDraw->isChecked())
{
ActionDraw(true);
}
} }
}); });
connect(doc, &VPattern::SetCurrentPP, this, &MainWindow::GlobalChangePP); connect(doc, &VPattern::SetCurrentPP, this, &MainWindow::GlobalChangePP);
@ -688,6 +691,7 @@ void MainWindow::ClosedDialogWithApply(int result)
vtool->FullUpdateFromGuiApply(); vtool->FullUpdateFromGuiApply();
} }
} }
SCASSERT(dialogTool != nullptr);
QGraphicsItem *tool = dynamic_cast<QGraphicsItem *>(dialogTool->GetAssociatedTool()); QGraphicsItem *tool = dynamic_cast<QGraphicsItem *>(dialogTool->GetAssociatedTool());
ui->view->itemClicked(tool); ui->view->itemClicked(tool);
if (dialogTool->GetAssociatedTool() != nullptr) if (dialogTool->GetAssociatedTool() != nullptr)