From 8413d021cfc0b1fac26ae030b2e87d5504d92d97 Mon Sep 17 00:00:00 2001 From: Paul Tucker Date: Mon, 19 Jul 1999 05:05:50 +0000 Subject: [PATCH] *** empty log message *** --- harbour/ChangeLog | 4 ++++ harbour/source/rtl/set.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7fea06a0d6..87d028904c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,7 @@ +19990719-00:55 EDT Paul Tucker + * source/rtl/set.c + * Trap for NIL param in Set( _SET_SETCOLOR, NIL ) + 19990719-00:12 EDT Paul Tucker * corrected new parameter check added {"SET",1,3} diff --git a/harbour/source/rtl/set.c b/harbour/source/rtl/set.c index d314d8bfdd..bea2fc069d 100644 --- a/harbour/source/rtl/set.c +++ b/harbour/source/rtl/set.c @@ -672,7 +672,7 @@ HARBOUR HB_SET (void) if (args > 1) hb_set.HB_SET_COLOR = set_string (pArg2, hb_set.HB_SET_COLOR); */ if (hb_set.HB_SET_COLOR) hb_xfree(hb_set.HB_SET_COLOR ); - hb_retc( hb_set.HB_SET_COLOR = hb_SetColor( args>1 ? pArg2->item.asString.value : (char *)0)); + hb_retc( hb_set.HB_SET_COLOR = hb_SetColor( args>1 ? IS_NIL(pArg2) ? "" : pArg2->item.asString.value : (char *)0)); break; case HB_SET_CONFIRM : hb_retl (hb_set.HB_SET_CONFIRM);