Merge pull request #1388 from heejune/dev

Resolving a bug #1247 (Sending files to channels)
This commit is contained in:
telegramdesktop 2015-12-13 14:56:21 +03:00
commit 76ca0acfd0
1 changed files with 7 additions and 0 deletions

View File

@ -4575,6 +4575,8 @@ void HistoryWidget::onDocumentSelect() {
void HistoryWidget::dragEnterEvent(QDragEnterEvent *e) {
if (!_history) return;
if (_peer && (_peer->isChannel() && !_peer->asChannel()->canPublish())) return;
_attachDrag = getDragState(e->mimeData());
updateDragAreas();
@ -4876,6 +4878,8 @@ void HistoryWidget::onPhotoDrop(const QMimeData *data) {
void HistoryWidget::onDocumentDrop(const QMimeData *data) {
if (!_history) return;
if (_peer && (_peer->isChannel() && !_peer->asChannel()->canPublish())) return;
QStringList files = getMediasFromMime(data);
if (files.isEmpty()) return;
@ -4883,6 +4887,9 @@ void HistoryWidget::onDocumentDrop(const QMimeData *data) {
}
void HistoryWidget::onFilesDrop(const QMimeData *data) {
if (_peer && (_peer->isChannel() && !_peer->asChannel()->canPublish())) return;
QStringList files = getMediasFromMime(data);
if (files.isEmpty()) {
if (data->hasImage()) {