Author: akv
Date: 2012-08-24 19:57:21 +0200 (Fri, 24 Aug 2012)
New Revision: 4255
Modified:
branches/4175-enfuse/src/rs-actions.c
branches/4175-enfuse/src/rs-enfuse.c
Log:
Making progress bar work a bit better...
Modified: branches/4175-enfuse/src/rs-actions.c
===================================================================
--- branches/4175-enfuse/src/rs-actions.c 2012-08-24 15:27:26 UTC (rev
4254)
+++ branches/4175-enfuse/src/rs-actions.c 2012-08-24 17:57:21 UTC (rev
4255)
@@ -1468,11 +1468,22 @@
{
gboolean enfuse = TRUE;
GList *selected_names = rs_store_get_selected_names(rs->store);
+
+ /* a bit of cleanup before we start enfusing */
+ rs_photo_close(rs->photo);
+ rs_preview_widget_set_photo((RSPreviewWidget *) rs->preview, NULL);
+ rs_preview_widget_lock_renderer((RSPreviewWidget *) rs->preview);
+ GUI_CATCHUP();
+
gchar *filename = rs_enfuse(rs, selected_names);
g_list_free(selected_names);
rs_cache_save_flags(filename, NULL, NULL, &enfuse);
rs_store_load_file(rs->store, filename);
rs_store_set_selected_name(rs->store, filename, TRUE);
+
+ /* unlocking render after enfusing */
+ rs_preview_widget_unlock_renderer((RSPreviewWidget *) rs->preview);
+
g_free(filename);
}
Modified: branches/4175-enfuse/src/rs-enfuse.c
===================================================================
--- branches/4175-enfuse/src/rs-enfuse.c 2012-08-24 15:27:26 UTC (rev
4254)
+++ branches/4175-enfuse/src/rs-enfuse.c 2012-08-24 17:57:21 UTC (rev
4255)
@@ -302,6 +302,7 @@
g_string_free(outname, TRUE);
}
+ g_usleep(100000); /* FIXME */
gui_progress_advance_one(progress); /* 1 - initiate */
GList *exported_names = export_images(rs, files, extend, 0, 1.0, 0, 1.0,
boundingbox);
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
