From b160049aa7da32d60e37362d8b75b516e3be8938 Mon Sep 17 00:00:00 2001
From: zolliker <zolliker>
Date: Fri, 2 Sep 2005 13:19:16 +0000
Subject: [PATCH] 'evfactory del' should not delete other objects than
 environment controllers

---
 evcontroller.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/evcontroller.c b/evcontroller.c
index 1da38864..515a2258 100644
--- a/evcontroller.c
+++ b/evcontroller.c
@@ -1412,14 +1412,13 @@ int RemoveEVController(SConnection *pCon, char *name) {
      SCWrite(pCon,"ERROR: cannot delete while running",eError);
      return 0;
   }
-  EVUnregister(FindEMON(pServ->pSics),name);
-  iRet = RemoveCommand(pServ->pSics,name);
-  if(!iRet)
-  {
-    sprintf(pBueffel,"ERROR: %s not found, NOT deleted",name);
-    SCWrite(pCon,pBueffel,eError);
+  if (!FindCommandData(pServ->pSics, name, "Environment Controller")) {
+    SCPrintf(pCon,eError,"ERROR: no environment controller %s found",name);
     return 0;
   }
+  
+  EVUnregister(FindEMON(pServ->pSics),name);
+  RemoveCommand(pServ->pSics,name);
   return 1;
 }
 /*-------------------------------------------------------------------------