From ff8d7d974c74e139f06791bef2aa85af22e0f122 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sun, 5 Aug 2012 22:29:35 +0100 Subject: Avoid redrawing palette-mapped images during BeginRefresh/EndRefresh (ie. SimpleRefresh damage redraw) as one of the DataTypes functions are causing an Intuition deadlock. --- amiga/plotters.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'amiga/plotters.c') diff --git a/amiga/plotters.c b/amiga/plotters.c index 5825f4c41..0078f0c8e 100755 --- a/amiga/plotters.c +++ b/amiga/plotters.c @@ -194,6 +194,8 @@ void ami_init_layers(struct gui_globals *gg, ULONG width, ULONG height) gg->surface = cairo_amigaos_surface_create(gg->rp->BitMap); gg->cr = cairo_create(gg->surface); #endif + + gg->locked_layers = false; } void ami_free_layers(struct gui_globals *gg) @@ -644,7 +646,8 @@ static bool ami_bitmap(int x, int y, int width, int height, struct bitmap *bitma if(palette_mapped == false) { tbm = ami_getcachenativebm(bitmap, width, height, glob->rp->BitMap); } else { - tbm = ami_bitmap_get_palettemapped(bitmap, width, height); + if(glob->locked_layers == false) + tbm = ami_bitmap_get_palettemapped(bitmap, width, height); } if(!tbm) return true; @@ -733,7 +736,8 @@ bool ami_bitmap_tile(int x, int y, int width, int height, if(palette_mapped == false) { tbm = ami_getcachenativebm(bitmap,width,height,glob->rp->BitMap); } else { - tbm = ami_bitmap_get_palettemapped(bitmap, width, height); + if(glob->locked_layers == false) + tbm = ami_bitmap_get_palettemapped(bitmap, width, height); } if(!tbm) return true; -- cgit v1.2.3