Changeset 223 for trunk/lua/chdku.lua

Timestamp:

03/11/2012 02:05:17 AM (15 months ago)

Author:

reyalp

Message:

improve error handling in list, update_connection_info

File:

• trunk/lua/chdku.lua (modified) (2 diffs)

trunk/lua/chdku.lua

@@ -778 +778 @@
 --[[
 set usbdev, ptpdev apiver for current connection
-TODO handle not connected/errors
 ]]
 function con_methods:update_connection_info()
+        -- this currently can't fail, devinfo is always stored in connection object
         self.usbdev=self:get_usb_devinfo()
-        self.ptpdev=self:get_ptp_devinfo()      
+        local status,err=self:get_ptp_devinfo() 
+        if status then
+                self.ptpdev = status
+        else
+                return false,err
+        end
         local major,minor=self:camera_api_version()
+        if not major then
+                return false,minor
+        end
         self.apiver={major=major,minor=minor}
+        return true
 end
 --[[
@@ -802 +811 @@
                 return true
         end
-        self:update_connection_info()
-        return true
+        return self:update_connection_info()
 end