SF.net SVN: openvrml:[3905] trunk

[<br...@us...>]

Revision: 3905
          http://openvrml.svn.sourceforge.net/openvrml/?rev=3905&view=rev
Author:   braden
Date:     2009-05-08 05:41:33 +0000 (Fri, 08 May 2009)

Log Message:
-----------
Make sure the plug's window pointer is nonnull.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/openvrml-xembed/browser.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-05-06 09:36:16 UTC (rev 3904)
+++ trunk/ChangeLog	2009-05-08 05:41:33 UTC (rev 3905)
@@ -1,3 +1,9 @@
+2009-05-08 Braden McDaniel  <br...@en...>
+
+	* src/openvrml-xembed/browser.cpp
+	(openvrml_xembed_browser_get_id(OpenvrmlXembedBrowser *)): Make
+	sure the plug's window pointer is nonnull.
+
 2009-05-06 Braden McDaniel  <br...@en...>
 
 	Fixed race condition when realizing the OpenvrmlXembedBrowserPlug.

Modified: trunk/src/openvrml-xembed/browser.cpp
===================================================================
--- trunk/src/openvrml-xembed/browser.cpp	2009-05-06 09:36:16 UTC (rev 3904)
+++ trunk/src/openvrml-xembed/browser.cpp	2009-05-08 05:41:33 UTC (rev 3905)
@@ -447,11 +447,13 @@
 {
     g_assert(browser);
     g_mutex_lock(browser->priv->browser_plug_mutex);
-    while (!browser->priv->browser_plug) {
+    while (!(browser->priv->browser_plug
+             && GTK_WIDGET(browser->priv->browser_plug)->window)) {
         g_cond_wait(browser->priv->browser_plug_realized_cond,
                     browser->priv->browser_plug_mutex);
     }
     g_assert(browser->priv->browser_plug);
+    g_assert(GTK_WIDGET(browser->priv->browser_plug)->window);
     gdk_threads_enter();
     const guint64 id = gtk_plug_get_id(GTK_PLUG(browser->priv->browser_plug));
     gdk_threads_leave();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.