Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
minoskt committed Aug 15, 2015
2 parents 45f88bc + 99ba146 commit 9ebb18d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

### 0.1.2
- Fix crash with error message “SensorModule is already registered”.

### 0.1.1
- Support csv format in sensor data
- Fix crash when deregistering multiple sensors modules
Expand Down
2 changes: 1 addition & 1 deletion SensingKit/SKSensorModuleManager.m
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ - (void)registerSensorModule:(SKSensorModuleType)moduleType
}

SKAbstractSensorModule *sensorModule = [self createSensorModule:moduleType];
[self.sensorModules insertObject:sensorModule atIndex:moduleType];
[self.sensorModules replaceObjectAtIndex:moduleType withObject:sensorModule];
}

- (void)deregisterSensorModule:(SKSensorModuleType)moduleType
Expand Down

0 comments on commit 9ebb18d

Please sign in to comment.