# HG changeset patch # User nadvornik # Date 1237142485 0 # Node ID a10d70ae85e9aa17922d8f9ca6ec5c0b0c9f5e30 # Parent a6f9ba6fd751c7560000cd8b0f5c483675f33b30 fixed segfault in osd called from img-view http://sourceforge.net/tracker/index.php?func=detail&aid=2684068&group_id=222125&atid=1054680 diff -r a6f9ba6fd751 -r a10d70ae85e9 src/image-overlay.c --- a/src/image-overlay.c Sun Mar 15 18:06:41 2009 +0000 +++ b/src/image-overlay.c Sun Mar 15 18:41:25 2009 +0000 @@ -147,25 +147,25 @@ void image_osd_toggle(ImageWindow *imd) { - OverlayStateData *osd; + OsdShowFlags show; if (!imd) return; - osd = image_get_osd_data(imd); - if (osd->show == OSD_SHOW_NOTHING) + show = image_osd_get(imd); + if (show == OSD_SHOW_NOTHING) { image_osd_set(imd, OSD_SHOW_INFO | OSD_SHOW_STATUS); return; } else { - if (osd->show & OSD_SHOW_HISTOGRAM) + if (show & OSD_SHOW_HISTOGRAM) { image_osd_set(imd, OSD_SHOW_NOTHING); } else { - image_osd_set(imd, osd->show | OSD_SHOW_HISTOGRAM); + image_osd_set(imd, show | OSD_SHOW_HISTOGRAM); } } }