diff options
Diffstat (limited to 'Sluift/SluiftComponent.cpp')
| -rw-r--r-- | Sluift/SluiftComponent.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Sluift/SluiftComponent.cpp b/Sluift/SluiftComponent.cpp index 126562e..ee09380 100644 --- a/Sluift/SluiftComponent.cpp +++ b/Sluift/SluiftComponent.cpp | |||
| @@ -78,7 +78,7 @@ bool SluiftComponent::isConnected() const { | |||
| 78 | 78 | ||
| 79 | void SluiftComponent::disconnect() { | 79 | void SluiftComponent::disconnect() { |
| 80 | component->disconnect(); | 80 | component->disconnect(); |
| 81 | while (component->isAvailable()) { | 81 | while (component->isActive()) { |
| 82 | eventLoop->runUntilEvents(); | 82 | eventLoop->runUntilEvents(); |
| 83 | } | 83 | } |
| 84 | } | 84 | } |
| @@ -105,12 +105,12 @@ boost::optional<SluiftComponent::Event> SluiftComponent::getNextEvent( | |||
| 105 | } | 105 | } |
| 106 | 106 | ||
| 107 | // Wait for new events | 107 | // Wait for new events |
| 108 | while (!watchdog.getTimedOut() && currentIndex >= pendingEvents.size() && component->isAvailable()) { | 108 | while (!watchdog.getTimedOut() && currentIndex >= pendingEvents.size() && component->isActive()) { |
| 109 | eventLoop->runUntilEvents(); | 109 | eventLoop->runUntilEvents(); |
| 110 | } | 110 | } |
| 111 | 111 | ||
| 112 | // Finish if we're disconnected or timed out | 112 | // Finish if we're disconnected or timed out |
| 113 | if (watchdog.getTimedOut() || !component->isAvailable()) { | 113 | if (watchdog.getTimedOut() || !component->isActive()) { |
| 114 | return boost::optional<Event>(); | 114 | return boost::optional<Event>(); |
| 115 | } | 115 | } |
| 116 | } | 116 | } |
Swift