[gphoto-cvs] SF.net SVN: gphoto:[13071] trunk/gphoto2/gphoto2/main.c

[<mar...@us...>]

Revision: 13071
          http://gphoto.svn.sourceforge.net/gphoto/?rev=13071&view=rev
Author:   marcusmeissner
Date:     2010-05-30 08:08:43 +0000 (Sun, 30 May 2010)

Log Message:
-----------
on cameras without timeout handling, return timeout in the
wait_and_handle_event

Modified Paths:
--------------
    trunk/gphoto2/gphoto2/main.c

Modified: trunk/gphoto2/gphoto2/main.c
===================================================================
--- trunk/gphoto2/gphoto2/main.c	2010-05-30 07:59:26 UTC (rev 13070)
+++ trunk/gphoto2/gphoto2/main.c	2010-05-30 08:08:43 UTC (rev 13071)
@@ -757,6 +757,7 @@
 	data = NULL;
 	result = gp_camera_wait_for_event(gp_params.camera, waittime, type, &data, gp_params.context);
 	if (result == GP_ERROR_NOT_SUPPORTED) {
+		*type = GP_EVENT_TIMEOUT;
 		usleep(waittime*1000);
 		return GP_OK;
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.