Merge branch 'develop'

minoskt · minoskt · commit 9ebb18dfb40f · 2015-08-15T08:18:33.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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
diff --git a/SensingKit/SKSensorModuleManager.m b/SensingKit/SKSensorModuleManager.m
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ - (void)registerSensorModule:(SKSensorModuleType)moduleType`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`SKAbstractSensorModule *sensorModule = [self createSensorModule:moduleType];`
`76`		`- [self.sensorModules insertObject:sensorModule atIndex:moduleType];`
	`76`	`+ [self.sensorModules replaceObjectAtIndex:moduleType withObject:sensorModule];`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`- (void)deregisterSensorModule:(SKSensorModuleType)moduleType`