Author: post
Date: 2012-02-17 23:45:57 +0100 (Fri, 17 Feb 2012)
New Revision: 4142

Modified:
   trunk/src/rs-tethered-shooting.c
Log:
Allow next image to export while downloading next image from camera.

Modified: trunk/src/rs-tethered-shooting.c
===================================================================
--- trunk/src/rs-tethered-shooting.c    2012-02-17 22:33:03 UTC (rev 4141)
+++ trunk/src/rs-tethered-shooting.c    2012-02-17 22:45:57 UTC (rev 4142)
@@ -501,6 +501,11 @@
        CHECKRETVAL(retval);
        retval = gp_camera_file_delete(t->camera, camera_file_path->folder, 
camera_file_path->name, t->context);
        CHECKRETVAL(retval);
+
+       /* Be sure there isn't a quick export still running */
+       while (NULL != t->rs->post_open_event)
+               g_usleep(100*1000);
+
        gdk_threads_lock();
 
        /* Copy settings */
@@ -579,16 +584,8 @@
        if (minimize)
                gtk_window_iconify(GTK_WINDOW(t->window));
 
-       GTK_CATCHUP();
        if (quick_export)
-       {
-               gdk_threads_unlock();
-               /* Lets just make sure we aren't ahead by more than 1 image */
-               while (NULL != t->rs->post_open_event)
-                       g_usleep(100*1000);
                t->rs->post_open_event = "QuickExport";
-               gdk_threads_lock();
-       }
 
        g_free(tmp_name_ptr);
        return GP_OK;


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

Reply via email to