Author: akv
Date: 2012-08-24 14:49:21 +0200 (Fri, 24 Aug 2012)
New Revision: 4253

Modified:
   branches/4175-enfuse/src/rs-actions.c
   branches/4175-enfuse/src/rs-enfuse.c
Log:
Returning filename of resulting image correctly.

Modified: branches/4175-enfuse/src/rs-actions.c
===================================================================
--- branches/4175-enfuse/src/rs-actions.c       2012-08-24 11:40:23 UTC (rev 
4252)
+++ branches/4175-enfuse/src/rs-actions.c       2012-08-24 12:49:21 UTC (rev 
4253)
@@ -1473,6 +1473,7 @@
   rs_cache_save_flags(filename, NULL, NULL, &enfuse);
   rs_store_load_file(rs->store, filename);
   rs_store_set_selected_name(rs->store, filename, TRUE);
+  g_free(filename);
 }
 
 RADIOACTION(right_popup)

Modified: branches/4175-enfuse/src/rs-enfuse.c
===================================================================
--- branches/4175-enfuse/src/rs-enfuse.c        2012-08-24 11:40:23 UTC (rev 
4252)
+++ branches/4175-enfuse/src/rs-enfuse.c        2012-08-24 12:49:21 UTC (rev 
4253)
@@ -309,13 +309,13 @@
   else
       aligned_names = exported_names;
   enfuse_images(aligned_names, fullpath->str, enfuse_options);
-  g_string_free(fullpath, TRUE);
+  gchar *filename = g_string_free(fullpath, FALSE);
   g_free(enfuse_options);
 
   // FIXME: Aparantly something goes wrong if we copy exifdata...
   //  rs_exif_copy(first, fullpath->str, "sRGB", RS_EXIF_FILE_TYPE_TIFF);
 
-  return fullpath->str;
+  return filename;
 }
 
 gboolean rs_has_enfuse (gint major, gint minor)


_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit

Reply via email to