3 files changed, 6 insertions, 7 deletions
diff --git a/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx b/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx
index e4b1f7979..c439ddf94 100644
--- a/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx
+++ b/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx
@@ -57,6 +57,7 @@ Fl_Xlib_Copy_Surface_Driver::Fl_Xlib_Copy_Surface_Driver(int w, int h) : Fl_Copy
   _ss = NULL;
   Fl_Surface_Device *present_surface = Fl_Surface_Device::surface();
   Fl_Surface_Device::set_current();
+  fl_push_no_clip();
   fl_window = xid;
   driver()->color(FL_WHITE);
   driver()->rectf(0, 0, w, h);
@@ -81,7 +82,6 @@ void Fl_Xlib_Copy_Surface_Driver::set_current() {
   fl_window = xid;
   if (!_ss) _ss = Fl_Surface_Device::surface();
   Fl_Surface_Device::set_current();
-  fl_push_no_clip();
 }
 
 
diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx
index 543e2ba7f..7ecb5471e 100644
--- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx
+++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx
@@ -714,9 +714,10 @@ void Fl_Xlib_Graphics_Driver::draw(Fl_RGB_Image *img, int XP, int YP, int WP, in
       depth |= FL_IMAGE_WITH_ALPHA;
     }
     if (surface) {
+      Fl_Surface_Device *old_surf = Fl_Surface_Device::surface();
       surface->set_current();
       fl_draw_image(img->array, 0, 0, img->w(), img->h(), depth, img->ld());
-      surface->end_current();
+      old_surf->set_current();
       *Fl_Graphics_Driver::id(img) = surface->get_offscreen_before_delete();
       delete surface;
     }
diff --git a/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx b/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx
index 0c8303bf9..022a94066 100644
--- a/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx
+++ b/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx
@@ -27,6 +27,7 @@
 
 class Fl_Xlib_Image_Surface_Driver : public Fl_Image_Surface_Driver {
   friend class Fl_Image_Surface;
+  virtual void end_current_();
 public:
   Fl_Surface_Device *previous;
   Window pre_window;
@@ -37,7 +38,6 @@ public:
   void translate(int x, int y);
   void untranslate();
   Fl_RGB_Image *image();
-  void end_current();
 };
 
 Fl_Image_Surface_Driver *Fl_Image_Surface_Driver::newImageSurfaceDriver(int w, int h, int high_res, Fl_Offscreen off)
@@ -62,8 +62,8 @@ Fl_Xlib_Image_Surface_Driver::~Fl_Xlib_Image_Surface_Driver() {
 void Fl_Xlib_Image_Surface_Driver::set_current() {
   pre_window = fl_window;
   if (!previous) previous = Fl_Surface_Device::surface();
-  fl_window = offscreen;
   Fl_Surface_Device::set_current();
+  fl_window = offscreen;
   fl_push_no_clip();
 }
 
@@ -78,16 +78,14 @@ void Fl_Xlib_Image_Surface_Driver::untranslate() {
 Fl_RGB_Image* Fl_Xlib_Image_Surface_Driver::image()
 {
   unsigned char *data = fl_read_image(NULL, 0, 0, width, height, 0);
-  end_current();
   Fl_RGB_Image *image = new Fl_RGB_Image(data, width, height);
   image->alloc_array = 1;
   return image;
 }
 
-void Fl_Xlib_Image_Surface_Driver::end_current()
+void Fl_Xlib_Image_Surface_Driver::end_current_()
 {
   fl_pop_clip();
-  previous->Fl_Surface_Device::set_current();
   fl_window = pre_window;
 }