Merge /u/l-chang/cdesktopenv1/ branch master into master

https://sourceforge.net/p/cdesktopenv/code/merge-requests/22/
2021-02-14 20:37:30 +00:00
parent 61436fbe97 80f7fe7739
commit f171814fa4
8 changed files with 48 additions and 22 deletions
--- a/cde/programs/dtfile/OverWrite.c
+++ b/cde/programs/dtfile/OverWrite.c
@@ -1153,9 +1153,14 @@ create_replace_rename_dialog(Widget         parent_widget,


  XtFree(title);
-  XtFree(actions.actionList[1].label);
-  actions.actionList[1].label = orig_label;
+
+  if (actions.actionList[1].label != orig_label) {
+      XtFree(actions.actionList[1].label);
+      actions.actionList[1].label = orig_label;
+  }
+
  actions.actionList[1].msg_num = orig_msg_num;
+
  return;

 }  /* end create_replace_rename_dialog */