Call virtual member Fl_Surface_Device::end_current() when necessary

Rename member function Fl_Surface_Device::end_current_() to end_current(),
set it protected, and make it called by the destructor of all classes
derived from Fl_Surface_Device that re-implement end_current().
This way, end_current() runs equally if Fl_Surface_Device()::pop_current()
is called before or after the drawing surface is deleted.

2 files changed, 6 insertions, 4 deletions

diff --git a/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx b/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx
index 2f1edd9dd..5818eb2a5 100644
--- a/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx
+++ b/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx
@@ -28,7 +28,7 @@
 
 class Fl_Xlib_Copy_Surface_Driver : public Fl_Copy_Surface_Driver {
   friend class Fl_Copy_Surface_Driver;
-  virtual void end_current_();
+  virtual void end_current();
 protected:
   Fl_Offscreen xid;
   Window oldwindow;
@@ -70,6 +70,7 @@ Fl_Xlib_Copy_Surface_Driver::~Fl_Xlib_Copy_Surface_Driver() {
   delete rgb;
   fl_delete_offscreen(xid);
   delete driver();
+  if (!need_push) end_current();
 }
 
 
@@ -79,7 +80,7 @@ void Fl_Xlib_Copy_Surface_Driver::set_current() {
   fl_window = xid;
 }
 
-void Fl_Xlib_Copy_Surface_Driver::end_current_() {
+void Fl_Xlib_Copy_Surface_Driver::end_current() {
   fl_window = oldwindow;
 }
 
diff --git a/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx b/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx
index d27fb03f3..1a9e7796d 100644
--- a/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx
+++ b/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx
@@ -21,7 +21,7 @@
 #include "../../Fl_Screen_Driver.H"
 
 class Fl_Xlib_Image_Surface_Driver : public Fl_Image_Surface_Driver {
-  virtual void end_current_();
+  virtual void end_current();
 public:
   Window pre_window;
   Fl_Xlib_Image_Surface_Driver(int w, int h, int high_res, Fl_Offscreen off);
@@ -55,6 +55,7 @@ Fl_Xlib_Image_Surface_Driver::Fl_Xlib_Image_Surface_Driver(int w, int h, int hig
 Fl_Xlib_Image_Surface_Driver::~Fl_Xlib_Image_Surface_Driver() {
   if (offscreen && !external_offscreen) XFreePixmap(fl_display, offscreen);
   delete driver();
+  if (is_current()) end_current();
 }
 
 void Fl_Xlib_Image_Surface_Driver::set_current() {
@@ -77,7 +78,7 @@ Fl_RGB_Image* Fl_Xlib_Image_Surface_Driver::image()
   return image;
 }
 
-void Fl_Xlib_Image_Surface_Driver::end_current_()
+void Fl_Xlib_Image_Surface_Driver::end_current()
 {
   fl_window = pre_window;
 }