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

eeschema: Finish moving Advanced Config bus 

Missed a definition for unfolding bus

Fixes: lp:1824628
* https://bugs.launchpad.net/kicad/+bug/1824628
This commit is contained in:
Seth Hillbrand 2019-04-13 07:28:40 -07:00
parent 3e7969ab8d
commit 9ea7fe5338
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eeschema/onrightclick.cpp
View File

@ -34,6 +34,7 @@
#include <sch_edit_frame.h> #include <sch_edit_frame.h>
#include <menus_helpers.h> #include <menus_helpers.h>
#include <advanced_config.h>
#include <class_library.h> #include <class_library.h>
#include <general.h> #include <general.h>
#include <hotkeys.h> #include <hotkeys.h>
@ -766,7 +767,8 @@ void AddMenusForBus( wxMenu* PopMenu, SCH_LINE* Bus, SCH_EDIT_FRAME* frame )
AddMenuItem( PopMenu, ID_POPUP_SCH_BREAK_WIRE, _( "Break Bus" ), KiBitmap( break_bus_xpm ) ); AddMenuItem( PopMenu, ID_POPUP_SCH_BREAK_WIRE, _( "Break Bus" ), KiBitmap( break_bus_xpm ) );
// TODO(JE) remove once real-time is enabled // TODO(JE) remove once real-time is enabled
#ifndef CONNECTIVITY_REAL_TIME if( !ADVANCED_CFG::GetCfg().m_realTimeConnectivity )
{
frame->RecalculateConnections(); frame->RecalculateConnections();
// Have to pick up the pointer again because it may have been changed by SchematicCleanUp // Have to pick up the pointer again because it may have been changed by SchematicCleanUp
@ -774,7 +776,7 @@ void AddMenusForBus( wxMenu* PopMenu, SCH_LINE* Bus, SCH_EDIT_FRAME* frame )
Bus = dynamic_cast<SCH_LINE*>( frame->LocateAndShowItem( pos, SCH_COLLECTOR::AllItemsButPins, Bus = dynamic_cast<SCH_LINE*>( frame->LocateAndShowItem( pos, SCH_COLLECTOR::AllItemsButPins,
0, &actionCancelled ) ); 0, &actionCancelled ) );
wxASSERT( Bus ); wxASSERT( Bus );
#endif }
// Bus unfolding menu (only available if bus is properly defined) // Bus unfolding menu (only available if bus is properly defined)
auto connection = Bus->Connection( *g_CurrentSheet ); auto connection = Bus->Connection( *g_CurrentSheet );