Index: apitest
===================================================================
RCS file: /cvsroot/bluez/utils/test/apitest,v
retrieving revision 1.1
diff -u -r1.1 apitest
--- apitest	28 Sep 2006 15:23:24 -0000	1.1
+++ apitest	19 Oct 2006 12:30:33 -0000
@@ -399,7 +399,8 @@
             self.dbus_mgr_sig_setup()
             self.dbus_dev_sig_setup()
             print 'Listening for events...'
-        elif self.cmd in mgr_cmds:
+
+        if self.cmd in mgr_cmds:
             try:
                 self.dbus_mgr_setup()
             except dbus.DBusException, e:
@@ -413,7 +414,7 @@
                 print 'Failed to setup device interface: %s' % e
                 sys.exit(1)
             self.call_dev_dbus_func()
-        else:
+        else if not self.listen:
             print 'Unknown command: %s' % self.cmd
             self.usage()
             sys.exit(1)