Merged 2.4 branch
r2828 | ffr | 2009-11-25 09:56:49 +1100 (Wed, 25 Nov 2009) | 2 lines
This commit is contained in:
committed by
Douglas Clowes
parent
c58ee9fbcb
commit
2ec6505ef8
@@ -21,6 +21,7 @@
|
||||
#include "devexec.h"
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
extern int ANSTO_HTTP_PAUSE;
|
||||
static int HMCStatus_ANSTO(void *pData, SConnection *pCon)
|
||||
// A slightly modified version of the original HMCStatus(),
|
||||
// to support pause-on-count-terminate option for ANSTO HM,
|
||||
@@ -47,9 +48,10 @@ static int HMCStatus_ANSTO(void *pData, SConnection *pCon)
|
||||
// functions to do this.
|
||||
// ffr: NOTE: Pause() is now mapped to AnstoHttpVeto()
|
||||
// we need to call AnstoHttpPause() via the histmem Pause
|
||||
if (((pHMcontrol_ANSTO)pData)->Pause_HM_After_Count==1)
|
||||
if (((pHMcontrol_ANSTO)pData)->Pause_HM_After_Count==1) {
|
||||
ANSTO_HTTP_PAUSE = 1;
|
||||
self->pCount->Pause(self,pCon);
|
||||
else
|
||||
} else
|
||||
self->pCount->Halt(self);
|
||||
}
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user