From fc48cdc5e73f1368806cd59a57330fd84875da04 Mon Sep 17 00:00:00 2001
From: Ron Anderson <ron.anderson@raytheon.com>
Date: Wed, 19 Sep 2012 09:37:05 -0500
Subject: [PATCH] Issue #436 Fix deleting zones

Change-Id: I03f07f8a5a7a06c4c96128de25b17204392cc466

Former-commit-id: 9cbabdb8f413373c6a7d99e36fba363a42627cd4 [formerly a925e1432a059d4bfe1582a82c3d4e13caedbff9]
Former-commit-id: 2d7c80b0cf129d601a0ed973e0b56fadc111c8ac
---
 .../cave/etc/gfe/userPython/procedures/MakeHazard.py   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/MakeHazard.py b/cave/build/static/common/cave/etc/gfe/userPython/procedures/MakeHazard.py
index 8b263bd0ab..9b41e7087d 100644
--- a/cave/build/static/common/cave/etc/gfe/userPython/procedures/MakeHazard.py
+++ b/cave/build/static/common/cave/etc/gfe/userPython/procedures/MakeHazard.py
@@ -224,8 +224,14 @@ class Procedure (SmartScript.SmartScript):
             hazardKey = selectedHazard
             
         defaultHazKey = ""
-        if len(defaultSegment) > 0 and defaultHazard is not None:
-            defaultHazKey = defaultHazard + ":" + defaultSegment
+        if defaultHazard is not None:
+            index = string.find(defaultHazard, " ")
+            if index != -1:
+                defaultHazard = defaultHazard[0:index]
+            defaultHazKey = defaultHazard
+            
+            if len(defaultSegment) > 0:
+                defaultHazKey += ":" + defaultSegment
 
         weName = self._hazUtils._makeTempWEName(hazardKey)