[dia/dia-0-97] Bug #585973 and bug #586921 - Database dialog crash on close



commit baa73d12e3f8ce44fefb3bf85eaef9b5e30c8758
Author: Hans Breuer <hans breuer org>
Date:   Sun Jun 28 18:09:48 2009 +0200

    Bug #585973 and bug #586921 - Database dialog crash on close
    (cherry picked from commit 59d925a698b194a7bec6b84072c6c64a59f651f8)

 objects/Database/table_dialog.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/objects/Database/table_dialog.c b/objects/Database/table_dialog.c
index 729243f..038f8de 100644
--- a/objects/Database/table_dialog.c
+++ b/objects/Database/table_dialog.c
@@ -821,7 +821,7 @@ attributes_page_update_cur_attr_item (TablePropDialog * prop_dialog)
   GtkLabel * label;
   gchar * str;
 
-  if (prop_dialog->cur_attr_list_item != NULL)
+  if (prop_dialog && prop_dialog->cur_attr_list_item)
     {
       attr = (TableAttribute *)
         gtk_object_get_user_data (GTK_OBJECT (prop_dialog->cur_attr_list_item));
@@ -885,7 +885,7 @@ attributes_list_selection_changed_cb (GtkWidget * gtklist, Table * table)
    * Thus, we stop it before it gets that bad.  See bug #156706 for
    * one example.
    */
-  if (table->destroyed == TRUE)
+  if (table->destroyed || !table->prop_dialog)
     return;
 
   prop_dialog = table->prop_dialog;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]