gthumb r2353 - in branches/gthumb-2-10: . libgthumb

[mjc svn gnome org]

Author: mjc
Date: Mon Jul 21 13:34:57 2008
New Revision: 2353
URL: http://svn.gnome.org/viewvc/gthumb?rev=2353&view=rev

Log:
2008-07-21  Michael J. Chudobiak  <mjc svn gnome org>

        * NEWS:
        * libgthumb/comments.c: (save_comment):
        Fixed segfault when using edit->remove comment on image
        with no comments. Bug #543771.



Modified:
   branches/gthumb-2-10/ChangeLog
   branches/gthumb-2-10/NEWS
   branches/gthumb-2-10/libgthumb/comments.c

Modified: branches/gthumb-2-10/NEWS
==============================================================================
--- branches/gthumb-2-10/NEWS	(original)
+++ branches/gthumb-2-10/NEWS	Mon Jul 21 13:34:57 2008
@@ -9,6 +9,7 @@
 	* Fixed bug #507790. Sort by DateTimeOriginal instead of DateTime.
 	* Fixed bug #512374 - array accessed past end.
 	* Fixed bug #543584 - fix build with libgphoto2 2.4.2
+	* Fixed bug #543771 - Segfault when hitting "Remove comment"
 
 version 2.10.8
 --------------

Modified: branches/gthumb-2-10/libgthumb/comments.c
==============================================================================
--- branches/gthumb-2-10/libgthumb/comments.c	(original)
+++ branches/gthumb-2-10/libgthumb/comments.c	Mon Jul 21 13:34:57 2008
@@ -793,6 +793,11 @@
 	if ((uri == NULL) || ! is_local_file (uri))
 		return;
 
+	if (comment_data_is_void (data)) {
+		comment_delete (uri);
+		return;
+	}
+
 	if (save_embedded) {
 #ifdef HAVE_LIBIPTCDATA
 		if (image_is_jpeg (uri))
@@ -800,11 +805,6 @@
 #endif /* HAVE_LIBIPTCDATA */
 	}
 
-	if (comment_data_is_void (data)) {
-		comment_delete (uri);
-		return;
-	}
-
 	/* Convert data to strings. */
 
 	time_str = g_strdup_printf ("%ld", data->time);