diff options
| author | Kevin Smith <git@kismith.co.uk> | 2010-05-25 13:35:57 (GMT) | 
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2010-05-25 13:35:57 (GMT) | 
| commit | 11b38f8479650b7f66a818d4cd6665e8445c82a1 (patch) | |
| tree | 1b57491a0771d329783d8f4b09223b55df7f6024 | |
| parent | db7e02a41e34af2542b5f124e083ea51fe6b497d (diff) | |
| download | swift-11b38f8479650b7f66a818d4cd6665e8445c82a1.zip swift-11b38f8479650b7f66a818d4cd6665e8445c82a1.tar.bz2 | |
Don't attempt to come back from auto-away when you weren't.
Resolves: #379
| -rw-r--r-- | Swift/Controllers/MainController.cpp | 4 | 
1 files changed, 4 insertions, 0 deletions
| diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp index c2d31d6..596edd2 100644 --- a/Swift/Controllers/MainController.cpp +++ b/Swift/Controllers/MainController.cpp @@ -291,6 +291,10 @@ void MainController::handleInputIdleChanged(bool idle) {  		}  	}  	else { +		if (!preIdlePresence_) { +			/* We didn't go autoaway (the user was already away when the timer ticked */ +			return; +		}  		if (client_ && client_->isAvailable()) {  			sendPresence(preIdlePresence_);  		} else { | 
 Swift
 Swift