Merge branch 'master' of https://github.com/VCVRack/Rack into 2017-10-bontric-midi-interface-revamp

dep/Makefile

@@ -133,7 +133,7 @@ ifeq ($(ARCH),win)
 else
 	$(WGET) http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz
 	$(UNTAR) pa_stable_v190600_20161030.tgz
-	cd portaudio && ./configure --prefix="$(LOCAL)" $(PORTAUDIO_ASIO)
+	cd portaudio && ./configure --prefix="$(LOCAL)" --disable-debug --disable-dependency-tracking --enable-mac-universal=no
 	$(MAKE) -C portaudio
 	$(MAKE) -C portaudio install
 endif

src/app/Port.cpp

@@ -1,4 +1,5 @@
 #include "app.hpp"
+#include "gui.hpp"
 
 
 namespace rack {
@@ -34,7 +35,7 @@ void Port::onDragStart() {
 	// Try to grab wire on top of stack
 	WireWidget *wire = gRackWidget->wireContainer->getTopWire(this);
 
-	if (wire) {
+	if (wire && !guiIsModPressed()) {
 		// Disconnect existing wire
 		if (type == INPUT)
 			wire->inputPort = NULL;