Fixed Issue dtmilano#67: Runaway Timer

dtmilano · dtmilano · commit 44784a9b9a34 · 2013-11-05T00:56:23.000-05:00
- Version 4.7.2
- Solution provided by sk87287
diff --git a/AndroidViewClient/setup.py b/AndroidViewClient/setup.py
@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 setup(name='androidviewclient',
-    version='4.7.1',
+    version='4.7.2',
     description='''AndroidViewClient is a 100% pure python tool that
         simplifies test script creation providing higher level operations and the ability of
         obtaining the tree of Views present at any given moment on the device or emulator screen.
diff --git a/AndroidViewClient/src/com/dtmilano/android/adb/adbclient.py b/AndroidViewClient/src/com/dtmilano/android/adb/adbclient.py
@@ -17,7 +17,7 @@
 @author: Diego Torres Milano
 '''
 
-__version__ = '4.7.1'
+__version__ = '4.7.2'
 
 import sys
 import warnings
@@ -168,10 +168,12 @@ def __checkOk(self):
         recv = self.socket.recv(4)
         if DEBUG:
             print >> sys.stderr, "    __checkOk: recv=", repr(recv)
-        if recv != OKAY:
-            error = self.socket.recv(1024)
-            raise RuntimeError("ERROR: %s %s" % (repr(recv), error))
-        self.setAlarm(0)
+        try:
+            if recv != OKAY:
+                error = self.socket.recv(1024)
+                raise RuntimeError("ERROR: %s %s" % (repr(recv), error))
+        finally:
+            self.setAlarm(0)
         if DEBUG:
             print >> sys.stderr, "    __checkOk: returning True"
         return True
