linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ANSTO_MERGE_2' of ssh://gitorious.psi.ch/~hauser_n/sinqdev/ansto-sics into develop

Browse Source 
Conflicts:
	conman.c
	drive.c
This commit is contained in:
koennecke
2016-01-15 15:17:17 +01:00
parent cdce9cc2c9 eff54a5fd9
commit a37aae2361
31 changed files with 1492 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
conman.c
View File

@ -481,7 +481,10 @@ SConnection *SCCopyConnection(SConnection * pCon)
result->iMacro = pCon->iMacro;
result->iTelnet = pCon->iTelnet;
result->iOutput = pCon->iOutput;
result->write = pCon->write;
if (pCon->oldWriteFunc != NULL)
result->write = pCon->oldWriteFunc;
else
result->write = pCon->write;
result->listening = pCon->listening;
result->eInterrupt = pCon->eInterrupt;
result->inUse = pCon->inUse;