aboutsummaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorAbhi Beckert <abhi@abhibeckert.com>2014-09-11 21:02:09 +1000
committerAbhi Beckert <abhi@abhibeckert.com>2014-09-11 21:02:09 +1000
commit22d2e2a62f994c1e11cf87c48cb0d526b9078b92 (patch)
tree37532d05007018c006b21f9ff45bc17ec06806b5 /Source
parent198a0622e41f0fb73d4abf462db1e4c204c85b54 (diff)
parent3a89efac73fad1713327e4108ed84c65c38a955b (diff)
downloadsequelpro-22d2e2a62f994c1e11cf87c48cb0d526b9078b92.tar.gz
sequelpro-22d2e2a62f994c1e11cf87c48cb0d526b9078b92.tar.bz2
sequelpro-22d2e2a62f994c1e11cf87c48cb0d526b9078b92.zip
Merge pull request #1956 from schmurfy/controlmaster
Cohabitation with terminal (with ControlMaster)
Diffstat (limited to 'Source')
-rw-r--r--Source/SPSSHTunnel.m1
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/SPSSHTunnel.m b/Source/SPSSHTunnel.m
index 4e621177..ff220318 100644
--- a/Source/SPSSHTunnel.m
+++ b/Source/SPSSHTunnel.m
@@ -337,6 +337,7 @@
} else {
// Disable muxing if requested
+ [taskArguments addObject:@"-S none"];
[taskArguments addObject:@"-o ControlMaster=no"];
}