Merge pull request #126 from slaveriq/master

Fixing a crash when level is type None
2013-09-25 10:08:09 -07:00 · 2013-09-25 10:08:09 -07:00 · f3049ed451
parent 35830e3d50 8485494ea7
commit f3049ed451
1 changed files with 6 additions and 3 deletions
--- a/lib/solaar/cli/show.py
+++ b/lib/solaar/cli/show.py
@ -107,10 +107,13 @@ def _print_device(dev):
 		if battery is not None:
 			from logitech_receiver.common import NamedInt as _NamedInt
 			level, status = battery
-			if isinstance(level, _NamedInt):
-				text = str(level)
+			if level is not None:
+				if isinstance(level, _NamedInt):
+					text = str(level)
+				else:
+					text = '%d%%' % level
 			else:
-				text = '%d%%' % level
+				text = 'N/A'
 			print ('     Battery: %s, %s.' % (text, status))
 		else:
 			print ('     Battery status unavailable.')