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

Fixed pcbnew crash when a locked footprint is dragged from an edge of the screen.

This commit is contained in:
Maciej Suminski 2014-08-01 11:28:08 +02:00
parent 73005087d5
commit 94a46bf2df
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/view/wx_view_controls.cpp
View File

@ -240,7 +240,7 @@ void WX_VIEW_CONTROLS::onTimer( wxTimerEvent& aEvent )
#if wxCHECK_VERSION( 3, 0, 0 ) #if wxCHECK_VERSION( 3, 0, 0 )
moveEvent.SetControlDown( wxGetKeyState( WXK_CONTROL ) ); moveEvent.SetControlDown( wxGetKeyState( WXK_CONTROL ) );
moveEvent.SetShiftDown( wxGetKeyState( WXK_SHIFT ) ); moveEvent.SetShiftDown( wxGetKeyState( WXK_SHIFT ) );
moveEvent.SetAltDown( wxGetKeyState( WXK_ALT) ); moveEvent.SetAltDown( wxGetKeyState( WXK_ALT ) );
#else #else
// wx <3.0 do not have accessors, but the fields are exposed // wx <3.0 do not have accessors, but the fields are exposed
moveEvent.m_controlDown = wxGetKeyState( WXK_CONTROL ); moveEvent.m_controlDown = wxGetKeyState( WXK_CONTROL );

4
pcbnew/tools/edit_tool.cpp
View File

@ -102,7 +102,6 @@ int EDIT_TOOL::Main( TOOL_EVENT& aEvent )
PCB_BASE_EDIT_FRAME* editFrame = getEditFrame<PCB_BASE_EDIT_FRAME>(); PCB_BASE_EDIT_FRAME* editFrame = getEditFrame<PCB_BASE_EDIT_FRAME>();
controls->ShowCursor( true ); controls->ShowCursor( true );
controls->SetSnapping( true ); controls->SetSnapping( true );
controls->SetAutoPan( true );
controls->ForceCursorPosition( false ); controls->ForceCursorPosition( false );
// Main loop: keep receiving events // Main loop: keep receiving events
@ -159,7 +158,7 @@ int EDIT_TOOL::Main( TOOL_EVENT& aEvent )
} }
else // Prepare to start dragging else // Prepare to start dragging
{ {
if( m_selectionTool->CheckLock() ) if( m_selectionTool->CheckLock() || selection.Empty() )
break; break;
// Save items, so changes can be undone // Save items, so changes can be undone
@ -188,6 +187,7 @@ int EDIT_TOOL::Main( TOOL_EVENT& aEvent )
wxPoint( origin.x, origin.y ); wxPoint( origin.x, origin.y );
} }
controls->SetAutoPan( true );
m_dragging = true; m_dragging = true;
} }