all repos — fluxbox @ d6ed5970a8f91d42d75dc7106a4ba03e0da23f97

custom fork of the fluxbox windowmanager

minor cleaning
fluxgen fluxgen
commit

d6ed5970a8f91d42d75dc7106a4ba03e0da23f97

parent

7c24bf9b5a6886a7033927e7338af6f102ec4669

1 files changed, 14 insertions(+), 13 deletions(-)

jump to
M src/Image.ccsrc/Image.cc

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Image.cc,v 1.16 2002/09/15 09:42:00 fluxgen Exp $ +// $Id: Image.cc,v 1.17 2002/11/14 10:12:42 fluxgen Exp $ //use GNU extensions #ifndef _GNU_SOURCE

@@ -2288,23 +2288,24 @@ }

void BImageControl::removeImage(Pixmap pixmap) { - if (pixmap) { - CacheList::iterator it = cache.begin(); - CacheList::iterator it_end = cache.end(); - for (; it != it_end; ++it) { - if ((*it)->pixmap == pixmap) { - if ((*it)->count) { - (*it)->count--; + if (!pixmap) + return; + + CacheList::iterator it = cache.begin(); + CacheList::iterator it_end = cache.end(); + for (; it != it_end; ++it) { + if ((*it)->pixmap == pixmap) { + if ((*it)->count) { + (*it)->count--; #ifdef TIMEDCACHE - timeout(); + timeout(); #else // !TIMEDCACHE - if (! (*it)->count) timeout(); + if (! (*it)->count) timeout(); #endif // TIMEDCACHE - } - - return; } + + return; } } }