fix display of splash screen (at least on X11)

[ardour.git] / gtk2_ardour / splash.cc

diff --git a/gtk2_ardour/splash.cc b/gtk2_ardour/splash.cc
index 941350646dcad97a86b057b8174f6d7a2e2050a9..0922ec75ba1fd8273372370de9f37095dfd3c293 100644 (file)
--- a/gtk2_ardour/splash.cc
+++ b/gtk2_ardour/splash.cc
@@ -83,6 +83,7 @@ Splash::Splash ()
        the_splash = this;
 
         expose_done = false;
+        expose_is_the_one = false;
 
        ARDOUR::BootMessage.connect (msg_connection, invalidator (*this), boost::bind (&Splash::boot_message, this, _1), gui_context());
 }
@@ -151,8 +152,10 @@ Splash::expose (GdkEventExpose* ev)
        /* this must execute AFTER the GDK idle update mechanism 
         */
        
-       Glib::signal_idle().connect (sigc::mem_fun (this, &Splash::idle_after_expose),
-                                    GDK_PRIORITY_REDRAW+2);
+       if (expose_is_the_one) {
+               Glib::signal_idle().connect (sigc::mem_fun (this, &Splash::idle_after_expose),
+                                            GDK_PRIORITY_REDRAW+2);
+       }
 
        return true;
 }
@@ -177,7 +180,8 @@ Splash::display ()
        
        if (!was_mapped) {
                expose_done = false;
-       }
+               expose_is_the_one = false;
+       } 
 
        pop_front ();
        present ();
@@ -186,6 +190,7 @@ Splash::display ()
                while (!expose_done) {
                        gtk_main_iteration ();
                }
+               gdk_display_flush (gdk_display_get_default());
        }
 }
 
@@ -211,5 +216,13 @@ Splash::message (const string& msg)
                 while (!expose_done) {
                         gtk_main_iteration ();
                 }
+               gdk_display_flush (gdk_display_get_default());
        }
 }
+
+bool
+Splash::on_map_event (GdkEventAny* ev)
+{
+       expose_is_the_one = true;
+       return Window::on_map_event (ev);
+}