haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

eeschema: fix assertion fail when aborting a paste block operation after the pasted block has been rotated 

Fixes: lp:1812073
* https://bugs.launchpad.net/kicad/+bug/1812073
This commit is contained in:
Tomasz Włostowski 2019-01-17 00:46:47 +01:00
parent 2d5752f51d
commit 786ee0ec69
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eeschema/schedit.cpp
View File

@ -853,7 +853,7 @@ void SCH_EDIT_FRAME::OnRotate( wxCommandEvent& aEvent )
// Compute the rotation center and put it on grid: // Compute the rotation center and put it on grid:
wxPoint rotationPoint = GetNearestGridPosition( block.Centre() ); wxPoint rotationPoint = GetNearestGridPosition( block.Centre() );
if( block.GetCommand() != BLOCK_DUPLICATE ) if( block.GetCommand() != BLOCK_DUPLICATE && block.GetCommand() != BLOCK_PASTE )
{ {
SaveCopyInUndoList( block.GetItems(), UR_ROTATED, block.AppendUndo(), rotationPoint ); SaveCopyInUndoList( block.GetItems(), UR_ROTATED, block.AppendUndo(), rotationPoint );
block.SetAppendUndo(); block.SetAppendUndo();
@ -1214,7 +1214,7 @@ void SCH_EDIT_FRAME::OnOrient( wxCommandEvent& aEvent )
mirrorPt = GetNearestGridPosition( mirrorPt ); mirrorPt = GetNearestGridPosition( mirrorPt );
SetCrossHairPosition( mirrorPt ); SetCrossHairPosition( mirrorPt );
if( block.GetCommand() != BLOCK_DUPLICATE ) if( block.GetCommand() != BLOCK_DUPLICATE && block.GetCommand() != BLOCK_PASTE )
{ {
SaveCopyInUndoList( block.GetItems(), UR_MIRRORED_X, block.AppendUndo(), mirrorPt ); SaveCopyInUndoList( block.GetItems(), UR_MIRRORED_X, block.AppendUndo(), mirrorPt );
block.SetAppendUndo(); block.SetAppendUndo();
@ -1232,7 +1232,7 @@ void SCH_EDIT_FRAME::OnOrient( wxCommandEvent& aEvent )
mirrorPt = GetNearestGridPosition( mirrorPt ); mirrorPt = GetNearestGridPosition( mirrorPt );
SetCrossHairPosition( mirrorPt ); SetCrossHairPosition( mirrorPt );
if( block.GetCommand() != BLOCK_DUPLICATE ) if( block.GetCommand() != BLOCK_DUPLICATE && block.GetCommand() != BLOCK_PASTE )
{ {
SaveCopyInUndoList( block.GetItems(), UR_MIRRORED_Y, block.AppendUndo(), mirrorPt ); SaveCopyInUndoList( block.GetItems(), UR_MIRRORED_Y, block.AppendUndo(), mirrorPt );
block.SetAppendUndo(); block.SetAppendUndo();