Merge tag '7.1'

2018-01-22 21:06:43 +01:00
parent 24b4a09d47 23e51e814f
commit de73a728f2
3 changed files with 9 additions and 1 deletions
@@ -83,7 +83,7 @@ XmlNode AdhocCommandsHandler::handle_request(const std::string& executor_jid, co
              XmlSubNode next(actions, "next");
            }
        }
-      else if (action == "cancel")
+      else if (session_it != this->sessions.end() && action == "cancel")
        {
          this->sessions.erase(session_it);
          command_node["status"] = "canceled";