X-Git-Url: https://git.decadent.org.uk/gitweb/?p=ion3.git;a=blobdiff_plain;f=ioncore%2Finfowin.c;h=66029b2a41ff5ad675769d8e0f9dc4d5d3b0758c;hp=791cae0880da701a2b04ebf7a87a89ee6abba776;hb=HEAD;hpb=7aea783be1d1de3555cfd377997a6ff7151e9112 diff --git a/ioncore/infowin.c b/ioncore/infowin.c index 791cae0..66029b2 100644 --- a/ioncore/infowin.c +++ b/ioncore/infowin.c @@ -1,7 +1,7 @@ /* * ion/ioncore/infowin.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ @@ -198,18 +198,22 @@ void infowin_set_text(WInfoWin *p, const char *str, int maxw) { bool set=FALSE; - if(maxw>0 && p->brush!=NULL){ - char *tmp=grbrush_make_label(p->brush, str, maxw); - if(tmp!=NULL){ - infowin_do_set_text(p, tmp); - free(tmp); - set=TRUE; + if(str==NULL){ + INFOWIN_BUFFER(p)[0]='\0'; + }else{ + if(maxw>0 && p->brush!=NULL){ + char *tmp=grbrush_make_label(p->brush, str, maxw); + if(tmp!=NULL){ + infowin_do_set_text(p, tmp); + free(tmp); + set=TRUE; + } } + + if(!set) + infowin_do_set_text(p, str); } - if(!set) - infowin_do_set_text(p, str); - infowin_resize(p); /* sometimes unnecessary */