[dia/dia-0-96] [git diff {3deeb43,8afe7b0} > rev-3832.diff]

[Hans Breuer <hans src gnome org>]

commit fed378bbd33aa9e104dfc4a5f0bcc096f9cc844e
Author: Hans Breuer <hans breuer org>
Date:   Mon Apr 13 14:51:09 2009 +0200

    [git diff {3deeb43,8afe7b0} > rev-3832.diff]
    
    2007-10-27  Hans Breuer  <hans breuer org>
    
    * app/diagram.c(diagram_load) : don't kill the default diagram on
     import failure. Fixes bug #490546
---
 ChangeLog     |    6 ++++++
 app/diagram.c |    3 ++-
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0066d78..646944e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,12 @@
 	* lib/diagdkrenderer.c dia_image.[ch] : don't use dia_image_draw()
 	for up-scaling of images to reduce memory consumption (bug #439885)
 
+[git diff {3deeb43,8afe7b0} > rev-3832.diff]
+2007-10-27  Hans Breuer  <hans breuer org>
+
+	* app/diagram.c(diagram_load) : don't kill the default diagram on 
+	import failure. Fixes bug #490546
+
 2008-03-16  Hans Breuer  <hans breuer org>
 
 	* lib/libdia.def : added missing exports
diff --git a/app/diagram.c b/app/diagram.c
index 3a24dc2..2217843 100644
--- a/app/diagram.c
+++ b/app/diagram.c
@@ -284,7 +284,8 @@ diagram_load(const char *filename, DiaImportFilter *ifilter)
 
   if (   !diagram_init(diagram, filename)
       || !diagram_load_into (diagram, filename, ifilter)) {
-    diagram_destroy(diagram);
+    if (!was_default) /* don't kill the default diagram on import failure */
+      diagram_destroy(diagram);
     diagram = NULL;
   } else {
     diagram->unsaved = FALSE;