Skip to content

Commit

Permalink
Fixed race condition, 0.4.1 release.
Browse files Browse the repository at this point in the history
  • Loading branch information
Kacper20 committed Apr 24, 2016
1 parent 1c38dff commit 5b0bbb6
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#0.4.1
- Fixed possinle race condition in `setNotifyAndMonitor` function
#0.4.0
- Documentation updated
- Use cases added to example app
Expand Down
2 changes: 1 addition & 1 deletion RxBluetoothKit.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "RxBluetoothKit"
s.version = "0.4.0"
s.version = "0.4.1"
s.summary = "Bluetooth library for RxSwift"

s.description = <<-DESC
Expand Down
3 changes: 2 additions & 1 deletion RxBluetoothKit/Peripheral.swift
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,8 @@ public class Peripheral {
public func setNotificationAndMonitorUpdatesForCharacteristic(characteristic: Characteristic)
-> Observable<Characteristic> {
return Observable.of(monitorValueUpdateForCharacteristic(characteristic),
setNotifyValue(true, forCharacteristic: characteristic).ignoreElements()).merge()
setNotifyValue(true, forCharacteristic: characteristic).ignoreElements()
.subscribeOn(CurrentThreadScheduler.instance)).merge()
}

//MARK: Descriptors
Expand Down

0 comments on commit 5b0bbb6

Please sign in to comment.