2 files changed, 13 insertions, 8 deletions
diff --git a/src/Fl_File_Chooser.cxx b/src/Fl_File_Chooser.cxx
index c5288e92a..e5274cb51 100644
--- a/src/Fl_File_Chooser.cxx
+++ b/src/Fl_File_Chooser.cxx
@@ -27,7 +27,6 @@
 
 #include "../FL/Fl_File_Chooser.H"
 #include <FL/fl_draw.H>
-#include <FL/Fl_Bitmap.H>
 
 void Fl_File_Chooser::cb_window_i(Fl_Double_Window*, void*) {
   fileName->value("");
@@ -60,9 +59,14 @@ void Fl_File_Chooser::cb_newButton(Fl_Button* o, void* v) {
   ((Fl_File_Chooser*)(o->parent()->parent()->user_data()))->cb_newButton_i(o,v);
 }
 
+#include <FL/Fl_Bitmap.H>
 static const unsigned char idata_new[] =
 {0,0,120,0,132,0,2,1,1,254,1,128,49,128,49,128,253,128,253,128,49,128,49,
 128,1,128,1,128,255,255,0,0};
+static Fl_Image *image_new() {
+  static Fl_Image *image = new Fl_Bitmap(idata_new, 16, 16);
+  return image;
+}
 
 void Fl_File_Chooser::cb__i(Fl_Tile*, void*) {
   update_preview();
@@ -163,10 +167,8 @@ void Fl_File_Chooser::cb_favOkButton(Fl_Return_Button* o, void* v) {
 }
 
 Fl_File_Chooser::Fl_File_Chooser(const char *d, const char *p, int t, const char *title) {
-  static Fl_Bitmap *image_new = NULL;
-  if (!image_new) {
+  if (!prefs_) {
     prefs_ = new Fl_Preferences(Fl_Preferences::USER, "fltk.org", "filechooser");
-    image_new = new Fl_Bitmap(idata_new, 16, 16);
   }
   Fl_Group *prev_current = Fl_Group::current();
   { window = new Fl_Double_Window(490, 380, "Choose File");
@@ -186,7 +188,7 @@ Fl_File_Chooser::Fl_File_Chooser(const char *d, const char *p, int t, const char
         favoritesButton->label(favorites_label);
       } // Fl_Menu_Button* favoritesButton
       { Fl_Button* o = newButton = new Fl_Button(455, 10, 25, 25);
-        newButton->image(image_new);
+        newButton->image( image_new() );
         newButton->labelsize(8);
         newButton->callback((Fl_Callback*)cb_newButton);
         o->tooltip(new_directory_tooltip);
diff --git a/src/Fl_File_Chooser.fl b/src/Fl_File_Chooser.fl
index c7332a776..c0940be94 100644
--- a/src/Fl_File_Chooser.fl
+++ b/src/Fl_File_Chooser.fl
@@ -36,7 +36,7 @@ class FL_EXPORT Fl_File_Chooser {open
 } {
   decl {enum { SINGLE = 0, MULTI = 1, CREATE = 2, DIRECTORY = 4 };} {public local
   }
-  decl {static Fl_Preferences prefs_;} {private local
+  decl {static Fl_Preferences *prefs_;} {private local
   }
   decl {void (*callback_)(Fl_File_Chooser*, void *);} {private local
   }
@@ -69,6 +69,9 @@ class FL_EXPORT Fl_File_Chooser {open
   decl {void update_preview();} {private local
   }
   Function {Fl_File_Chooser(const char *d, const char *p, int t, const char *title)} {} {
+    code {if (!prefs_) {
+  prefs_ = new Fl_Preferences(Fl_Preferences::USER, "fltk.org", "filechooser");
+}} {}
     code {Fl_Group *prev_current = Fl_Group::current();} {}
     Fl_Window window {
       label {Choose File}
@@ -238,7 +241,7 @@ update_favorites();
 value(d);
 type(t);
 int e;
-prefs_.get("preview", e, 1);
+prefs_->get("preview", e, 1);
 preview(e);
 Fl_Group::current(prev_current);} {}
     code {ext_group=(Fl_Widget*)0;} {}
@@ -307,7 +310,7 @@ showChoiceCB();} {}
   }
   Function {ok_label(const char *l)} {return_type void
   } {
-    code {okButton->label(l);
+    code {if (l) okButton->label(l);
 int w=0, h=0;
 okButton->measure_label(w, h);
 okButton->resize(cancelButton->x() - 50 - w, cancelButton->y(),