From e6bfd5f1d5363353f52dbc4b4ec9950187b8e698 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 9 Jan 2008 19:37:07 +0000
Subject: [PATCH] Fix #278

---
 src/libprs500/devices/prs500/driver.py | 2 ++
 src/libprs500/devices/scanner.py       | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/libprs500/devices/prs500/driver.py b/src/libprs500/devices/prs500/driver.py
index 9d83dc1a13..950a023d13 100755
--- a/src/libprs500/devices/prs500/driver.py
+++ b/src/libprs500/devices/prs500/driver.py
@@ -97,6 +97,8 @@ class PRS500(Device):
 
     VENDOR_ID    = 0x054c #: SONY Vendor Id
     PRODUCT_ID   = 0x029b #: Product Id for the PRS-500
+    PRODUCT_NAME = 'PRS-500'
+    VENDOR_NAME  = 'SONY'
     INTERFACE_ID = 0      #: The interface we use to talk to the device
     BULK_IN_EP   = 0x81   #: Endpoint for Bulk reads
     BULK_OUT_EP  = 0x02   #: Endpoint for Bulk writes
diff --git a/src/libprs500/devices/scanner.py b/src/libprs500/devices/scanner.py
index c37dbed779..cbcc9329f1 100644
--- a/src/libprs500/devices/scanner.py
+++ b/src/libprs500/devices/scanner.py
@@ -55,7 +55,14 @@ class DeviceScanner(object):
         return linux_scanner()
     
     def scan(self):
-        self.devices = self.get_devices()
+        try: # Windows WMI occassionally and temporarily barfs
+            self.devices = self.get_devices()
+        except Exception, e:
+            if not iswindows:
+                raise e
+            import traceback
+            traceback.print_exc()
+            
         
     def is_device_connected(self, device):
         if iswindows: