2 files changed, 3 insertions, 0 deletions
diff --git a/src/Fl_Image.cxx b/src/Fl_Image.cxx
index f4bf30b3e..b02d43f75 100644
--- a/src/Fl_Image.cxx
+++ b/src/Fl_Image.cxx
@@ -297,6 +297,8 @@ int Fl_Image::draw_scaled(int X, int Y, int W, int H) {
   return 1;
 }
 
+/** True after fl_register_images() was called, false before */
+bool Fl_Image::register_images_done = false;
 
 //
 // RGB image class...
diff --git a/src/fl_images_core.cxx b/src/fl_images_core.cxx
index 58fcd2e5f..d610fb8c4 100644
--- a/src/fl_images_core.cxx
+++ b/src/fl_images_core.cxx
@@ -57,6 +57,7 @@ static Fl_Image	*fl_check_images(const char *name, uchar *header, int headerlen)
 */
 void fl_register_images() {
   Fl_Shared_Image::add_handler(fl_check_images);
+  Fl_Image::register_images_done = true;
 }