Mime: do not abort if no globs were loaded
This commit is contained in:
parent
7fd37d6f92
commit
63084f226c
|
@ -128,15 +128,12 @@ Mime * mime_new(GtkIconTheme * theme)
|
||||||
for(g = globs, priority = 0; *g != NULL; g++)
|
for(g = globs, priority = 0; *g != NULL; g++)
|
||||||
if((fp = fopen(*g, "r")) != NULL)
|
if((fp = fopen(*g, "r")) != NULL)
|
||||||
break;
|
break;
|
||||||
if(fp == NULL)
|
|
||||||
{
|
|
||||||
error_set_code(1, "%s", "Could not load MIME globs");
|
|
||||||
object_delete(mime);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
mime->types = NULL;
|
mime->types = NULL;
|
||||||
mime->types_cnt = 0;
|
mime->types_cnt = 0;
|
||||||
_new_config(mime);
|
_new_config(mime);
|
||||||
|
if(fp == NULL)
|
||||||
|
/* XXX no globs could be loaded */
|
||||||
|
return mime;
|
||||||
while(fgets(buf, sizeof(buf), fp) != NULL)
|
while(fgets(buf, sizeof(buf), fp) != NULL)
|
||||||
{
|
{
|
||||||
errno = EINVAL;
|
errno = EINVAL;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user