Fix a bug where pending sensor operations will result in changing the…

… download target from a capture once the pending operation returns. Extremely noticeable on the FbF sensor where /configure can take upwards of one minute. Related to #170.
NIST-BWS · Apr 12, 2013 · 94281fb · 94281fb
1 parent 293e382
commit 94281fb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/wsabi2/views/interfaceElements/sources/BWSPersonTableViewCell.m b/wsabi2/views/interfaceElements/sources/BWSPersonTableViewCell.m
@@ -828,12 +828,12 @@ -(void) showCapturePopoverAtIndex:(int) index
             //grab the lock and try to configure the sensor
             [link setConfiguration:link.currentSessionId
                      withParameters:params
-                           deviceID:[activeCell.item.objectID URIRepresentation]];
+                           deviceID:[targetItem.objectID URIRepresentation]];
         }
         else {
             //Something's up, and the sensor was not properly initialized. Try again, starting from reconnecting.
             [link beginConnectConfigureSequenceWithConfigurationParams:params
-                            deviceID:[activeCell.item.objectID URIRepresentation]];
+                            deviceID:[targetItem.objectID URIRepresentation]];
         }
 
         // No way to know the arrow direction until the popover is shown once,

diff --git a/wsabi2/views/personList/source/BWSViewController.m b/wsabi2/views/personList/source/BWSViewController.m
@@ -732,6 +732,7 @@ - (void)popoverControllerDidDismissPopover:(UIPopoverController *)aPopoverContro
 {
     BWSPersonTableViewCell *activeCell = (BWSPersonTableViewCell*)[self.tableView cellForRowAtIndexPath:[self.tableView indexPathForSelectedRow]];
     [activeCell selectItem:nil]; //clear selection
+    activeCell = nil;
     [self.view logPopoverControllerDismissed:aPopoverController];
 }