From d469e85e5440ec789861d20965bed22c0b709b56 Mon Sep 17 00:00:00 2001 From: "dbaron%dbaron.org" Date: Mon, 9 Aug 2004 23:13:07 +0000 Subject: [PATCH] Merging changes between MOZILLA_1_7_RELEASE and AVIARY_20040809_MERGEPOINT, a=ben: bug 249520 git-svn-id: svn://10.0.0.236/branches/AVIARY_1_0_20040515_BRANCH@160567 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/embedding/browser/gtk/src/gtkmozembed2.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mozilla/embedding/browser/gtk/src/gtkmozembed2.cpp b/mozilla/embedding/browser/gtk/src/gtkmozembed2.cpp index 6c10719373b..d852f60e7f5 100644 --- a/mozilla/embedding/browser/gtk/src/gtkmozembed2.cpp +++ b/mozilla/embedding/browser/gtk/src/gtkmozembed2.cpp @@ -520,7 +520,12 @@ gtk_moz_embed_destroy(GtkObject *object) embedPrivate = (EmbedPrivate *)embed->data; if (embedPrivate) { - embedPrivate->Destroy(); + + // Destroy the widget only if it's been Init()ed. + if(embedPrivate->mMozWindowWidget != 0) { + embedPrivate->Destroy(); + } + delete embedPrivate; embed->data = NULL; }