mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag '7.1'

Browse Source
This commit is contained in:
louiz’
2018-01-22 21:06:43 +01:00
parent 24b4a09d47 23e51e814f
commit de73a728f2
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.rst
+5
View File
@@ -1,3 +1,8 @@
Version 7.1 - 2018-01-22
========================
- Fix a crash happening if a user cancels a non-existing ad-hoc session
Version 7.0 - 2018-01-17 Version 7.0 - 2018-01-17
======================== ========================
packaging/biboumi.spec.cmake
+3
View File
@@ -66,6 +66,9 @@ make check %{?_smp_mflags}
* ${RPM_DATE} Le Coz Florent <louiz@louiz.org> - ${RPM_VERSION}-1 * ${RPM_DATE} Le Coz Florent <louiz@louiz.org> - ${RPM_VERSION}-1
- Build latest git revision - Build latest git revision
* Wed Jan 22 2018 Le Coz Florent <louiz@louiz.org> - 7.1-1
Update to version 7.1
* Wed Jan 17 2018 Le Coz Florent <louiz@louiz.org> - 7.0-1 * Wed Jan 17 2018 Le Coz Florent <louiz@louiz.org> - 7.0-1
Update to version 7.0 Update to version 7.0
src/xmpp/adhoc_commands_handler.cpp
+1 -1
View File
@@ -83,7 +83,7 @@ XmlNode AdhocCommandsHandler::handle_request(const std::string& executor_jid, co
XmlSubNode next(actions, "next"); XmlSubNode next(actions, "next");
} }
} }
else if (action == "cancel") else if (session_it != this->sessions.end() && action == "cancel")
{ {
this->sessions.erase(session_it); this->sessions.erase(session_it);
command_node["status"] = "canceled"; command_node["status"] = "canceled";