blockview #22 #25

libs/blockview/blockview.cpp

@@ -293,7 +293,7 @@ bool BlockView::eventFilter(QObject * o, QEvent * e) {
 				return true;
 			}
 			if (mm_ci) {
-				if ((mm_ci->data(bvidType).toInt() == bvitPin) && m_connect && !me->modifiers().testFlag(Qt::ControlModifier)) {
+				if ((mm_ci->data(bvidType).toInt() == bvitPin) && m_connect) {
 					if (qgraphicsitem_cast<BlockItemPin*>(mm_ci)->state() == BlockItemPin::Hover) {
 						trace_from = mm_ci->scenePos();
 						qgraphicsitem_cast<BlockItemPin*>(mm_ci)->clearStateStack();
@@ -318,8 +318,8 @@ bool BlockView::eventFilter(QObject * o, QEvent * e) {
 							wavetrace.setPreferredDirection(BlockViewWavetrace::Horizontal);
 						else
 							wavetrace.setPreferredDirection(BlockViewWavetrace::Vertical);
-						return true;
 					}
+					return true;
 				}
 			}
 			cur_scl = qSqrt(transform().determinant());
@@ -1740,6 +1740,8 @@ void BlockView::newBranchAccept(BlockBusItem * item) {
 	tmp_bus.hide();
 	if (tmp_bus.pol.size() < 2) return;
 	tmp_bus.pol.pop_front();
+	if ((tmp_bus.pol.size() == 1) && (tmp_bus.pol[0] == item->press_pos))
+		return;
 	int np = item->addPoint(item->press_pos);
 	if (np < 0) return;
 	if (match_bus) {