if ( DrawFullLine )
count = (COLS < destlen ? COLS : destlen);
else
- count = ((COLS-SidebarWidth) < destlen ? COLS - SidebarWidth : destlen);
+ count = ((COLS-SidebarWidth) < destlen ? (COLS - SidebarWidth) : destlen);
if (count > col)
{
count -= col; /* how many columns left on this line */
wptr += count;
col += count;
}
- if (len + wlen > destlen)
+ if (wid + wlen > destlen)
len = destlen - wlen;
+ else
+ len = wid;
memcpy (wptr, buf, len);
wptr += len;
wlen += len;