correctly search for contact when doing pm

2014-06-01 16:51:51 +02:00 · 2014-06-01 16:51:51 +02:00 · e637d8ed15
parent 2e48120e0c
commit e637d8ed15
1 changed files with 3 additions and 1 deletions
--- a/src/common/connection.py
+++ b/src/common/connection.py
@ -463,7 +463,9 @@ class CommonConnection:
                msg_iq = iqs
        else:
            msg_iq.setTo(fjid)
-            r_ = resource or gajim.get_resource_from_jid(fjid)
+            r_ = resource
+            if not r_ and jid != fjid: # Only if we're not in a pm
+                r_ = gajim.get_resource_from_jid(fjid)
            if r_:
                contact = gajim.contacts.get_contact(self.name, jid, r_)
            else: