From 297b2f3dcf46c113fcac868a556d5a6ddd7bb47c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 28 Sep 2015 17:19:37 +0300
Subject: [PATCH] fixed webpage handling

---
 Telegram/BuildWin.bat               |  2 +-
 Telegram/SourceFiles/app.cpp        |  2 ++
 Telegram/SourceFiles/mainwidget.cpp | 23 +++++++++++------------
 Telegram/SourceFiles/mediaview.cpp  |  4 ++++
 Telegram/SourceFiles/structs.cpp    | 14 +++++++-------
 5 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/Telegram/BuildWin.bat b/Telegram/BuildWin.bat
index 6ad682411..e0a9d9ac3 100644
--- a/Telegram/BuildWin.bat
+++ b/Telegram/BuildWin.bat
@@ -15,7 +15,7 @@ set "AppVersionStrFull=%AppVersionStr%.dev"
 :devprepared
 
 echo.
-echo Building version %AppVersionStrFull%..
+echo Building version %AppVersionStrFull% for Windows..
 echo.
 
 if exist ..\Win32\Deploy\deploy\%AppVersionStrMajor%\%AppVersionStr%\ goto error_exist1
diff --git a/Telegram/SourceFiles/app.cpp b/Telegram/SourceFiles/app.cpp
index 4e11ec29a..54254fefb 100644
--- a/Telegram/SourceFiles/app.cpp
+++ b/Telegram/SourceFiles/app.cpp
@@ -752,6 +752,8 @@ namespace App {
 				}
 			}
 
+			existing->setMedia(m.has_media() ? (&m.vmedia) : 0);
+
 			existing->setViewsCount(m.has_views() ? m.vviews.v : -1);
 		}
 	}
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 3be54d658..ce3d76f90 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -4131,20 +4131,19 @@ void MainWidget::feedUpdates(const MTPUpdates &updates, uint64 randomId) {
 
 			feedUpdate(MTP_updateMessageID(d.vid, MTP_long(randomId))); // ignore real date
 			if (peerId) {
-				HistoryItem *item = App::histItemById(peerToChannel(peerId), d.vid.v);
-				if (!text.isEmpty()) {
-					bool hasLinks = d.has_entities() && !d.ventities.c_vector().v.isEmpty();
-					if (item && ((hasLinks && !item->hasTextLinks()) || (!hasLinks && item->textHasLinks()))) {
-						bool was = item->hasTextLinks();
-						item->setText(text, d.has_entities() ? linksFromMTP(d.ventities.c_vector().v) : LinksInText());
-						item->initDimensions();
-						itemResized(item);
-						if (!was && item->hasTextLinks() && (!item->history()->isChannel() || item->fromChannel())) {
-							item->history()->addToOverview(item, OverviewLinks);
+				if (HistoryItem *item = App::histItemById(peerToChannel(peerId), d.vid.v)) {
+					if (!text.isEmpty()) {
+						bool hasLinks = d.has_entities() && !d.ventities.c_vector().v.isEmpty();
+						if ((hasLinks && !item->hasTextLinks()) || (!hasLinks && item->textHasLinks())) {
+							item->setText(text, d.has_entities() ? linksFromMTP(d.ventities.c_vector().v) : LinksInText());
+							item->initDimensions();
+							itemResized(item);
+							if (item->hasTextLinks() && (!item->history()->isChannel() || item->fromChannel())) {
+								item->history()->addToOverview(item, OverviewLinks);
+							}
 						}
 					}
-				}
-				if (item) {
+
 					item->setMedia(d.has_media() ? (&d.vmedia) : 0);
 				}
 			}
diff --git a/Telegram/SourceFiles/mediaview.cpp b/Telegram/SourceFiles/mediaview.cpp
index afc01138d..e0d3811ba 100644
--- a/Telegram/SourceFiles/mediaview.cpp
+++ b/Telegram/SourceFiles/mediaview.cpp
@@ -134,6 +134,10 @@ _saveMsgStarted(0), _saveMsgOpacity(0)
 }
 
 void MediaView::moveToScreen() {
+	if (App::wnd() && windowHandle() && App::wnd()->windowHandle() && windowHandle()->screen() != App::wnd()->windowHandle()->screen()) {
+		windowHandle()->setScreen(App::wnd()->windowHandle()->screen());
+	}
+
 	QPoint wndCenter(App::wnd()->x() + App::wnd()->width() / 2, App::wnd()->y() + App::wnd()->height() / 2);
 	QRect avail = App::app() ? App::app()->desktop()->screenGeometry(wndCenter) : QDesktopWidget().screenGeometry(wndCenter);
 	if (avail != geometry()) {
diff --git a/Telegram/SourceFiles/structs.cpp b/Telegram/SourceFiles/structs.cpp
index 6f2a9d304..fa7154f5a 100644
--- a/Telegram/SourceFiles/structs.cpp
+++ b/Telegram/SourceFiles/structs.cpp
@@ -468,30 +468,30 @@ void PtsWaiter::clearSkippedUpdates() {
 bool PtsWaiter::updated(ChannelData *channel, int32 pts, int32 count) {
 	if (_requesting || _applySkippedLevel) {
 		return true;
-	} else if (pts <= _good) {
+	} else if (pts <= _good && count > 0) {
 		return false;
 	}
 	return check(channel, pts, count);
 }
 
-bool PtsWaiter::updated(ChannelData *channel, int32 pts, int32 ptsCount, const MTPUpdates &updates) {
+bool PtsWaiter::updated(ChannelData *channel, int32 pts, int32 count, const MTPUpdates &updates) {
 	if (_requesting || _applySkippedLevel) {
 		return true;
-	} else if (pts <= _good) {
+	} else if (pts <= _good && count > 0) {
 		return false;
-	} else if (check(channel, pts, ptsCount)) {
+	} else if (check(channel, pts, count)) {
 		return true;
 	}
 	_updatesQueue.insert(ptsKey(SkippedUpdates), updates);
 	return false;
 }
 
-bool PtsWaiter::updated(ChannelData *channel, int32 pts, int32 ptsCount, const MTPUpdate &update) {
+bool PtsWaiter::updated(ChannelData *channel, int32 pts, int32 count, const MTPUpdate &update) {
 	if (_requesting || _applySkippedLevel) {
 		return true;
-	} else if (pts <= _good) {
+	} else if (pts <= _good && count > 0) {
 		return false;
-	} else if (check(channel, pts, ptsCount)) {
+	} else if (check(channel, pts, count)) {
 		return true;
 	}
 	_updateQueue.insert(ptsKey(SkippedUpdate), update);