From: <mar...@us...> - 2010-07-05 08:12:15
|
Revision: 13120 http://gphoto.svn.sourceforge.net/gphoto/?rev=13120&view=rev Author: marcusmeissner Date: 2010-07-05 08:12:08 +0000 (Mon, 05 Jul 2010) Log Message: ----------- handle unknown changes better Modified Paths: -------------- trunk/libgphoto2/camlibs/ptp2/library.c Modified: trunk/libgphoto2/camlibs/ptp2/library.c =================================================================== --- trunk/libgphoto2/camlibs/ptp2/library.c 2010-07-05 08:08:31 UTC (rev 13119) +++ trunk/libgphoto2/camlibs/ptp2/library.c 2010-07-05 08:12:08 UTC (rev 13120) @@ -2536,9 +2536,11 @@ finish = 1; break; case PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN: - *eventtype = GP_EVENT_UNKNOWN; - *eventdata = entry.u.info; /* take over the allocated string allocation ownership */ - finish = 1; + if (entry.u.info) { + *eventtype = GP_EVENT_UNKNOWN; + *eventdata = entry.u.info; /* take over the allocated string allocation ownership */ + finish = 1; + } break; default: gp_log (GP_LOG_DEBUG, "ptp2/wait_for_eos_event", "Unhandled EOS event 0x%04x", entry.type); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |