Commit 61454f01 authored by CHARRAS's avatar CHARRAS
Browse files

eeschema: problem when undelete after a change a label type solved (I hope)

parent 1d16eae0

change_log.txt

+1 −2
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ email address. 
	- reference not copied in component copy.

	- incorrect redo when changing the chip name in component edition

	

	bugs not fixed

	- undo/redo problems when changing a text type between text, label, global label and hierarchical label

	bugs not fixed:

	- incorrect annotation in complex hierarchy with multi parts per package (duplicates created).

eeschema/edit_label.cpp

+6 −1
Original line number Diff line number Diff line
@@ -396,7 +396,8 @@ void WinEDA_SchematicFrame::ConvertTextType( DrawTextStruct* Text, 
		GetScreen()->SetCurItem( NULL );

        g_ItemToRepeat = NULL;

    }

    GetScreen()->SetCurItem( newtext );



    GetScreen()->SetCurItem( NULL );



	SAFE_DELETE( g_ItemToUndoCopy );
@@ -412,11 +413,15 @@ void WinEDA_SchematicFrame::ConvertTextType( DrawTextStruct* Text, 
        SaveCopyInUndoList( newtext, IS_NEW );

    }

    else

	{

		GetScreen()->SetCurItem( newtext );

        newtext->m_Flags = IS_NEW;

	}





    if( (flags & IS_MOVED) != 0 )

    {

		GetScreen()->SetCurItem( newtext );

        StartMoveTexte( newtext, DC );

    }