Updated to optionally build without replacing the parent display when…

… opening a related display no matter what the adl file says
epics-extensions · May 4, 2017 · 936021d · 936021d
1 parent b4a72d7
commit 936021d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/medm/Makefile b/medm/Makefile
@@ -127,6 +127,8 @@ ifdef JPT
 endif
 
 USR_CFLAGS += -DEDITRES
+#A crash can happen on RHEL7 when related displays replace the parent display
+USR_CFLAGS += -DNO_REPLACE_DISPLAY
 
 PROD_HOST = medm
 

diff --git a/medm/medmRelatedDisplay.c b/medm/medmRelatedDisplay.c
@@ -672,8 +672,10 @@ void parseRelatedDisplayEntry(DisplayInfo *displayInfo,
 	    } else if(!strcmp(token,"policy")) {
 		getToken(displayInfo,token);
 		getToken(displayInfo,token);
-		if(!strcmp(token,stringValueTable[REPLACE_DISPLAY]))
-		  relatedDisplay->mode = REPLACE_DISPLAY;
+#if !defined(NO_REPLACE_DISPLAY)
+                if(!strcmp(token,stringValueTable[REPLACE_DISPLAY]))
+                  relatedDisplay->mode = REPLACE_DISPLAY;
+#endif
 	    }
 	    break;
 	case T_LEFT_BRACE:

diff --git a/medm/medmVersion.h b/medm/medmVersion.h
@@ -67,7 +67,7 @@
  */
 #define MEDM_VERSION		3
 #define MEDM_REVISION		1
-#define MEDM_MODIFICATION	11
+#define MEDM_MODIFICATION	12
 #define MEDM_PATCH_LEVEL	0
-#define MEDM_VERSION_STRING	"MEDM Version 3.1.11"
-#define MEDM_VERSION_DIGITS	"MEDM030111"
+#define MEDM_VERSION_STRING	"MEDM Version 3.1.12"
+#define MEDM_VERSION_DIGITS	"MEDM030112"