aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

Notify trying to load 256 colour theme in incapable terminal

Browse Source
This commit is contained in:
Michael Vetter 2019-08-23 14:24:44 +02:00
parent 42fb1935c4
commit c2a565c2ec
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/config/color.c
View File

@ -398,6 +398,13 @@ int color_pair_cache_get(const char *pair_name)
return -1; return -1;
} }
if (COLORS < 256) {
if (fg > 7 || bg > 7) {
log_error("Color: trying to load 256 colour theme without capable terminal");
return -1;
}
}
/* try to find pair in cache */ /* try to find pair in cache */
for (i = 0; i < cache.size; i++) { for (i = 0; i < cache.size; i++) {
if (fg == cache.pairs[i].fg && bg == cache.pairs[i].bg) { if (fg == cache.pairs[i].fg && bg == cache.pairs[i].bg) {

3
src/config/theme.c
View File

@ -52,6 +52,7 @@
#include "config/theme.h" #include "config/theme.h"
#include "config/preferences.h" #include "config/preferences.h"
#include "config/color.h" #include "config/color.h"
#include "ui/ui.h"
static GString *theme_loc; static GString *theme_loc;
static GKeyFile *theme; static GKeyFile *theme;
@ -809,7 +810,7 @@ theme_attrs(theme_item_t attrs)
// lookup colour pair // lookup colour pair
result = color_pair_cache_get(lookup_str->str); result = color_pair_cache_get(lookup_str->str);
if (result < 0) { if (result < 0) {
log_error("Invalid color <%s>", lookup_str->str); cons_show("Unable to load colour theme");
result = 0; result = 0;
} }
g_string_free(lookup_str, TRUE); g_string_free(lookup_str, TRUE);