kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-18 05:00:33 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug fix: segfault when load project with folio report linked but without the same potential text

Browse Source 
(Assert QList(), in conductor.cpp)


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2815 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2014-02-06 21:35:13 +00:00
parent 0e46586892
commit 801a2d298f
7 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sources/diagramcommands.cpp
View File

@@ -26,6 +26,7 @@
#include "diagram.h"
#include "qetgraphicsitem/diagramtextitem.h"
#include "qetgraphicsitem/diagramimageitem.h"
#include "conductorautonumerotation.h"
/**
Constructeur
@@ -1153,7 +1154,8 @@ LinkElementsCommand::LinkElementsCommand(Element *elmt1, Element *elmt2, QUndoCo
diagram_(elmt1->diagram()),
elmt_1(elmt1),
elmt_2(elmt2),
previous_report(0)
previous_report(0),
first_redo(true)
{
if (elmt1->linkType() & Element::AllReport &&
elmt2->linkType() & Element::AllReport) {
@@ -1189,6 +1191,13 @@ void LinkElementsCommand::undo() {
void LinkElementsCommand::redo() {
diagram_->showMe();
elmt_1->linkToElement(elmt_2);
//Check if text of this potential is identical.
if (first_redo) {
if(elmt_1->conductors().count() && elmt_2->conductors().count()) {
ConductorAutoNumerotation::checkPotential(elmt_1->conductors().first());
}
first_redo = false;
}
}
/**