From 2b9df3d05a72bab1d8f439c7dbd3157160eb968b Mon Sep 17 00:00:00 2001
From: koennecke <koennecke>
Date: Fri, 4 Jun 2010 14:38:00 +0000
Subject: [PATCH] - Final fix for FOCUS problem

---
 hmdata.c   | 8 +++-----
 hmdata.h   | 1 -
 nxscript.c | 2 --
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/hmdata.c b/hmdata.c
index 457f94e0..b4c4edd1 100644
--- a/hmdata.c
+++ b/hmdata.c
@@ -33,7 +33,6 @@ pHMdata makeHMData(void)
   }
   memset(self, 0, sizeof(HMdata));
   self->nTimeChan = 1;
-  self->updateFlag = 1;
 
   return self;
 }
@@ -84,7 +83,7 @@ int resizeBuffer(pHMdata self)
     return 0;
   }
   memset(self->localBuffer, 0, size * sizeof(HistInt));
-  self->updateFlag = 1;
+  self->nextUpdate = 0;
   return 1;
 }
 
@@ -258,7 +257,7 @@ long getHMDataLength(pHMdata self)
 /*---------------------------------------------------------------------*/
 void updateHMData(pHMdata self)
 {
-  self->updateFlag = 1;
+  self->nextUpdate = 0;
 }
 
 /*--------------------------------------------------------------------
@@ -274,7 +273,7 @@ void updateHMData(pHMdata self)
   --------------------------------------------------------------------------*/
 static int mustUpdate(pHMdata self)
 {
-  if (self->updateFlag == 1 && time(NULL) >= self->nextUpdate) {
+  if (time(NULL) >= self->nextUpdate) {
     return 1;
   } else {
     return 0;
@@ -300,7 +299,6 @@ static int updateHMbuffer(pHistMem hist, int bank, SConnection * pCon)
                                        self->localBuffer);
     if (status == OKOK) {
       self->nextUpdate = time(NULL) + self->updateIntervall;
-      self->updateFlag = 0;
       break;
     } else {
       status = hist->pDriv->GetError(hist->pDriv, &iErr, pError, 79);
diff --git a/hmdata.h b/hmdata.h
index 108b0335..0cb43c5e 100644
--- a/hmdata.h
+++ b/hmdata.h
@@ -24,7 +24,6 @@ typedef struct __hmdata {
   int tofMode;
   time_t nextUpdate;
   int updateIntervall;
-  int updateFlag;
   HistInt *localBuffer;
   struct __hmdata *timeslave;
 } HMdata, *pHMdata;
diff --git a/nxscript.c b/nxscript.c
index a74b5d12..141e3bab 100644
--- a/nxscript.c
+++ b/nxscript.c
@@ -733,8 +733,6 @@ static void putHistogramMemory(SConnection * pCon, SicsInterp * pSics,
    */
   start = 0;
   length = GetHistLength(mem);
-  subset = 1;
-
   updateHMDim(self, mem);
 
   /*