1
0
mirror of https://github.com/irssi/irssi.git synced 2024-10-27 05:20:20 -04:00

Merge branch 'quarkslab'

This commit is contained in:
ailin-nemui 2016-09-14 13:44:51 +02:00
parent 52fedeaf02
commit 9de7a9b328

View File

@ -131,6 +131,8 @@ void unformat_24bit_color(char **ptr, int off, int *fgcolor, int *bgcolor, int *
unsigned char rgbx[4]; unsigned char rgbx[4];
unsigned int i; unsigned int i;
for (i = 0; i < 4; ++i) { for (i = 0; i < 4; ++i) {
if ((*ptr)[i + off] == '\0')
return;
rgbx[i] = (*ptr)[i + off]; rgbx[i] = (*ptr)[i + off];
} }
rgbx[3] -= 0x20; rgbx[3] -= 0x20;
@ -1357,6 +1359,9 @@ void format_send_to_gui(TEXT_DEST_REC *dest, const char *text)
bgcolor = *ptr==(char)0xff ? -1 : *ptr-'0'; bgcolor = *ptr==(char)0xff ? -1 : *ptr-'0';
} }
} }
if (*ptr == '\0')
break;
ptr++; ptr++;
break; break;
case 6: case 6: