summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Kaluza <hanzz.k@gmail.com>2011-09-18 11:38:24 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-09-18 11:38:24 (GMT)
commit9706f2c0979a41f6615ed40fd15ae9b219bdeec2 (patch)
tree08cf7c76b513ccb1ae886c23d0e8464a1e0ec07c /Swiften
parent2535c1d383fa16d02d547090bd2e64b79c3a24c8 (diff)
downloadswift-9706f2c0979a41f6615ed40fd15ae9b219bdeec2.zip
swift-9706f2c0979a41f6615ed40fd15ae9b219bdeec2.tar.bz2
Do not overwrite from attribute in component mode
License: This patch is BSD-licensed, see http://www.opensource.org/licenses/bsd-license.php
Diffstat (limited to 'Swiften')
-rw-r--r--Swiften/Queries/IQRouter.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Swiften/Queries/IQRouter.cpp b/Swiften/Queries/IQRouter.cpp
index 65f9d7f..c84e1bb 100644
--- a/Swiften/Queries/IQRouter.cpp
+++ b/Swiften/Queries/IQRouter.cpp
@@ -81,7 +81,7 @@ void IQRouter::removeHandler(boost::shared_ptr<IQHandler> handler) {
}
void IQRouter::sendIQ(boost::shared_ptr<IQ> iq) {
- if (from_.isValid()) {
+ if (from_.isValid() && !iq->getFrom().isValid()) {
iq->setFrom(from_);
}
channel_->sendIQ(iq);