Merge remote-tracking branch 'jasenhuang/master' into develop

Issue rsms#38
programmarchy · May 28, 2021 · 18a3167 · 18a3167
2 parents c75cd68 + dc2018d
commit 18a3167
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/peertalk/PTChannel.m b/peertalk/PTChannel.m
@@ -165,7 +165,7 @@ - (void)connectToPort:(int)port overUSBHub:(PTUSBHub*)usbHub deviceID:(NSNumber*
     return;
   }
   connState_ = kConnStateConnecting;
-  [usbHub connectToDevice:deviceID port:port onStart:^(NSError *err, dispatch_io_t dispatchChannel) {
+  [usbHub connectToDevice:deviceID port:port onQueue:protocol_.queue onStart:^(NSError *err, dispatch_io_t dispatchChannel) {
     NSError *error = err;
     if (!error) {
       [self startReadingFromConnectedChannel:dispatchChannel error:&error];

diff --git a/peertalk/PTUSBHub.h b/peertalk/PTUSBHub.h
@@ -68,6 +68,7 @@ typedef enum {
 //
 - (void)connectToDevice:(NSNumber*)deviceID
                    port:(int)port
+                onQueue:(dispatch_queue_t)queue
                 onStart:(void(^)(NSError *error, dispatch_io_t channel))onStart
                   onEnd:(void(^)(NSError *error))onEnd;
 

diff --git a/peertalk/PTUSBHub.m b/peertalk/PTUSBHub.m
@@ -222,11 +222,11 @@ - (void)listenOnQueue:(dispatch_queue_t)queue onStart:(void(^)(NSError*))onStart
 }
 
 
-- (void)connectToDevice:(NSNumber*)deviceID port:(int)port onStart:(void(^)(NSError*, dispatch_io_t))onStart onEnd:(void(^)(NSError*))onEnd {
+- (void)connectToDevice:(NSNumber*)deviceID port:(int)port onQueue:(dispatch_queue_t)queue onStart:(void(^)(NSError*, dispatch_io_t))onStart onEnd:(void(^)(NSError*))onEnd {
   PTUSBChannel *channel = [PTUSBChannel new];
   NSError *error = nil;
 
-  if (![channel openOnQueue:dispatch_get_main_queue() error:&error onEnd:onEnd]) {
+  if (![channel openOnQueue:queue error:&error onEnd:onEnd]) {
     onStart(error, nil);
     return;
   }