inlines part 3 - settings

2016-04-14 11:29:59 +03:00
parent af22d8ef23
commit 100d83aea7
6 changed files with 252 additions and 201 deletions
--- a/src/profile.py
+++ b/src/profile.py
@@ -896,7 +896,7 @@ class Profile(Contact, Singleton):
            if transfer.state:
                del self._file_transfers[(friend_number, file_number)]
                if type(transfer) is not SendAvatar:
-                    if type(transfer) is SendFromBuffer:  # inline
+                    if type(transfer) is SendFromBuffer and Settings.get_instance()['allow_inline']:  # inline
                        inline = InlineImage(transfer.get_data())
                        self.get_friend_by_number(friend_number).update_transfer_data(file_number,
                                                                                      FILE_TRANSFER_MESSAGE_STATUS['FINISHED'],