Merge pull request #290 from kovin/master

[simgrid.git] / src / s4u / s4u_Mailbox.cpp

diff --git a/src/s4u/s4u_Mailbox.cpp b/src/s4u/s4u_Mailbox.cpp
index b2b60de..8156900 100644 (file)
--- a/src/s4u/s4u_Mailbox.cpp
+++ b/src/s4u/s4u_Mailbox.cpp
@@ -48,8 +48,8 @@ bool Mailbox::ready()
   bool comm_ready = false;
   if (not pimpl_->comm_queue_.empty()) {
     comm_ready = pimpl_->comm_queue_.front()->state_ == SIMIX_DONE;
-  }
-  if (!comm_ready && pimpl_->permanent_receiver_ && not pimpl_->done_comm_queue_.empty()) {
+    
+  } else if (pimpl_->permanent_receiver_ && not pimpl_->done_comm_queue_.empty()) {
     comm_ready = pimpl_->done_comm_queue_.front()->state_ == SIMIX_DONE;
   }
   return comm_ready;