Tue Dec 7 18:02:22 PST 1999
(KainX) Fixed a seg fault in E-Mountbox if the images in the config file aren't found. It first falls back on the compiled-in defaults, and if that doesn't work either, it exits with an error. SVN revision: 1545
This commit is contained in:
parent
276863160e
commit
c53dd6e7bf
|
@ -1461,3 +1461,12 @@ Also, I modified E-Slides and E-NetGraph so that if the config file or the
|
||||||
default settings don't provide a valid image directory (for E-Slides) or a
|
default settings don't provide a valid image directory (for E-Slides) or a
|
||||||
valid network interface (E-NetGraph), rather than immediately exiting, you
|
valid network interface (E-NetGraph), rather than immediately exiting, you
|
||||||
will be presented with the config dialog. Very handy.
|
will be presented with the config dialog. Very handy.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Tue Dec 7 18:02:22 PST 1999
|
||||||
|
(KainX)
|
||||||
|
|
||||||
|
Fixed a seg fault in E-Mountbox if the images in the config file aren't found.
|
||||||
|
It first falls back on the compiled-in defaults, and if that doesn't work
|
||||||
|
either, it exits with an error.
|
||||||
|
|
|
@ -746,42 +746,37 @@ SetupGraphx(void)
|
||||||
/* load all images, scaled appropriately */
|
/* load all images, scaled appropriately */
|
||||||
memset(images, 0, MAXTYPE * sizeof(ImlibImage*));
|
memset(images, 0, MAXTYPE * sizeof(ImlibImage*));
|
||||||
tmp = Imlib_load_image(id, Epplet_query_config("CD_IMAGE"));
|
tmp = Imlib_load_image(id, Epplet_query_config("CD_IMAGE"));
|
||||||
if (tmp)
|
if (tmp || (tmp = Imlib_load_image(id, defaults[TYPE_CD].value)))
|
||||||
{
|
{
|
||||||
images[TYPE_CD] = Imlib_clone_scaled_image(id, tmp, 44, 32);
|
images[TYPE_CD] = Imlib_clone_scaled_image(id, tmp, 44, 32);
|
||||||
Imlib_destroy_image(id, tmp);
|
Imlib_destroy_image(id, tmp);
|
||||||
tmp = NULL;
|
|
||||||
}
|
}
|
||||||
tmp = Imlib_load_image(id, Epplet_query_config("HD_IMAGE"));
|
tmp = Imlib_load_image(id, Epplet_query_config("HD_IMAGE"));
|
||||||
if (tmp)
|
if (tmp || (tmp = Imlib_load_image(id, defaults[TYPE_HD].value)))
|
||||||
{
|
{
|
||||||
images[TYPE_HD] = Imlib_clone_scaled_image(id, tmp, 44, 32);
|
images[TYPE_HD] = Imlib_clone_scaled_image(id, tmp, 44, 32);
|
||||||
Imlib_destroy_image(id, tmp);
|
Imlib_destroy_image(id, tmp);
|
||||||
tmp = NULL;
|
|
||||||
}
|
}
|
||||||
tmp = Imlib_load_image(id, Epplet_query_config("FD_IMAGE"));
|
tmp = Imlib_load_image(id, Epplet_query_config("FD_IMAGE"));
|
||||||
if (tmp)
|
if (tmp || (tmp = Imlib_load_image(id, defaults[TYPE_FD].value)))
|
||||||
{
|
{
|
||||||
images[TYPE_FD] = Imlib_clone_scaled_image(id, tmp, 44, 32);
|
images[TYPE_FD] = Imlib_clone_scaled_image(id, tmp, 44, 32);
|
||||||
Imlib_destroy_image(id, tmp);
|
Imlib_destroy_image(id, tmp);
|
||||||
tmp = NULL;
|
|
||||||
}
|
}
|
||||||
tmp = Imlib_load_image(id, Epplet_query_config("ZIP_IMAGE"));
|
tmp = Imlib_load_image(id, Epplet_query_config("ZIP_IMAGE"));
|
||||||
if (tmp)
|
if (tmp || (tmp = Imlib_load_image(id, defaults[TYPE_ZIP].value)))
|
||||||
{
|
{
|
||||||
images[TYPE_ZIP] = Imlib_clone_scaled_image(id, tmp, 44, 32);
|
images[TYPE_ZIP] = Imlib_clone_scaled_image(id, tmp, 44, 32);
|
||||||
Imlib_destroy_image(id, tmp);
|
Imlib_destroy_image(id, tmp);
|
||||||
tmp = NULL;
|
|
||||||
}
|
}
|
||||||
tmp = Imlib_load_image(id, Epplet_query_config("BG_IMAGE"));
|
tmp = Imlib_load_image(id, Epplet_query_config("BG_IMAGE"));
|
||||||
if (tmp)
|
if (tmp || (tmp = Imlib_load_image(id, defaults[TYPE_BG].value)))
|
||||||
{
|
{
|
||||||
sscanf(Epplet_query_config("BG_BORDER"), "%i %i %i %i",
|
sscanf(Epplet_query_config("BG_BORDER"), "%i %i %i %i",
|
||||||
&(border.left), &(border.right), &(border.top), &(border.bottom));
|
&(border.left), &(border.right), &(border.top), &(border.bottom));
|
||||||
Imlib_set_image_border(id, tmp, &border);
|
Imlib_set_image_border(id, tmp, &border);
|
||||||
images[TYPE_BG] = Imlib_clone_scaled_image(id, tmp, 44 * num_tiles, 32);
|
images[TYPE_BG] = Imlib_clone_scaled_image(id, tmp, 44 * num_tiles, 32);
|
||||||
Imlib_destroy_image(id, tmp);
|
Imlib_destroy_image(id, tmp);
|
||||||
tmp = NULL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* see if we got all of them */
|
/* see if we got all of them */
|
||||||
|
@ -789,8 +784,11 @@ SetupGraphx(void)
|
||||||
check = (check && images[i]);
|
check = (check && images[i]);
|
||||||
if (!check)
|
if (!check)
|
||||||
{
|
{
|
||||||
|
/* Even the fallbacks didn't work. If we don't exit
|
||||||
|
here, we'll seg fault about 60 lines down. -- mej */
|
||||||
Epplet_dialog_ok("Could not load all images.");
|
Epplet_dialog_ok("Could not load all images.");
|
||||||
/* should I abort here ? .... hmmm dunno yet */
|
Esync();
|
||||||
|
exit(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* set tile images according to mountpoint types */
|
/* set tile images according to mountpoint types */
|
||||||
|
|
Loading…
Reference in New Issue