Alpha version 0.9.60: some bugfixes in video clip reader.

No more error box when click on record button (empty file send attempt).

Telegram/Resources/winrc/Telegram.rc

@@ -34,8 +34,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,9,59,0
+ FILEVERSION 0,9,60,0
- PRODUCTVERSION 0,9,59,0
+ PRODUCTVERSION 0,9,60,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -51,10 +51,10 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "CompanyName", "Telegram Messenger LLP"
-            VALUE "FileVersion", "0.9.59.0"
+            VALUE "FileVersion", "0.9.60.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2016"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "0.9.59.0"
+            VALUE "ProductVersion", "0.9.60.0"
         END
     END
     BLOCK "VarFileInfo"

Telegram/Resources/winrc/Updater.rc

@@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,9,59,0
+ FILEVERSION 0,9,60,0
- PRODUCTVERSION 0,9,59,0
+ PRODUCTVERSION 0,9,60,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -43,10 +43,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram Messenger LLP"
             VALUE "FileDescription", "Telegram Updater"
-            VALUE "FileVersion", "0.9.59.0"
+            VALUE "FileVersion", "0.9.60.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2016"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "0.9.59.0"
+            VALUE "ProductVersion", "0.9.60.0"
         END
     END
     BLOCK "VarFileInfo"

Telegram/SourceFiles/core/version.h

@@ -24,7 +24,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 
 #define BETA_VERSION_MACRO (0ULL)
 
-constexpr int AppVersion = 9059;
+constexpr int AppVersion = 9060;
-constexpr str_const AppVersionStr = "0.9.59";
+constexpr str_const AppVersionStr = "0.9.60";
 constexpr bool AppAlphaVersion = true;
 constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO;

Telegram/SourceFiles/historywidget.cpp

@@ -3497,7 +3497,7 @@ void HistoryWidget::onRecordError() {
 }
 
 void HistoryWidget::onRecordDone(QByteArray result, VoiceWaveform waveform, qint32 samples) {
-	if (!_peer) return;
+	if (!_peer || result.isEmpty()) return;
 
 	App::wnd()->activateWindow();
 	int32 duration = samples / AudioVoiceMsgFrequency;

Telegram/SourceFiles/media/media_clip_ffmpeg.cpp

@@ -303,6 +303,7 @@ bool FFMpegReaderImplementation::start(Mode mode, int64 &positionMs) {
 	_audioStreamId = av_find_best_stream(_fmtContext, AVMEDIA_TYPE_AUDIO, -1, -1, 0, 0);
 	if (_mode == Mode::OnlyGifv) {
 		if (_audioStreamId >= 0) { // should be no audio stream
+			_audioStreamId = -1; // do not attempt to access audioPlayer()
 			return false;
 		}
 		if (dataSize() > AnimationInMemory) {

Telegram/SourceFiles/media/media_clip_reader.cpp

@@ -630,16 +630,18 @@ Manager::ReaderPointers::const_iterator Manager::constUnsafeFindReaderPointer(Re
 
 bool Manager::handleProcessResult(ReaderPrivate *reader, ProcessResult result, uint64 ms) {
 	QReadLocker lock(&_readerPointersMutex);
-	ReaderPointers::const_iterator it = constUnsafeFindReaderPointer(reader);
+	auto it = constUnsafeFindReaderPointer(reader);
 	if (result == ProcessResult::Error) {
 		if (it != _readerPointers.cend()) {
-			it.key()->error();
-			emit callback(it.key(), it.key()->threadIndex(), NotificationReinit);
-
 			lock.unlock();
 			QWriteLocker lock(&_readerPointersMutex);
-			ReaderPointers::iterator i = unsafeFindReaderPointer(reader);
+
-			if (i != _readerPointers.cend()) _readerPointers.erase(i);
+			auto i = unsafeFindReaderPointer(reader);
+			if (i != _readerPointers.cend()) {
+				i.key()->error();
+				emit callback(i.key(), i.key()->threadIndex(), NotificationReinit);
+				_readerPointers.erase(i);
+			}
 		}
 		return false;
 	} else if (result == ProcessResult::Finished) {

Telegram/SourceFiles/mediaview.cpp

@@ -239,7 +239,6 @@ void MediaView::stopGif() {
 	_videoPaused = _videoStopped = _videoIsSilent = false;
 	_fullScreenVideo = false;
 	_clipController.destroy();
-	Sandbox::removeEventFilter(this);
 	if (audioPlayer()) {
 		disconnect(audioPlayer(), SIGNAL(updated(const AudioMsgId&)), this, SLOT(onVideoPlayProgress(const AudioMsgId&)));
 	}
@@ -437,7 +436,7 @@ void MediaView::step_state(uint64 ms, bool timer) {
 		if (dt >= 1) {
 			a_cOpacity.finish();
 			_controlsState = (_controlsState == ControlsShowing ? ControlsShown : ControlsHidden);
-			setCursor(_controlsState == ControlsHidden ? Qt::BlankCursor : (_over == OverNone ? style::cur_default : style::cur_pointer));
+			updateCursor();
 		} else {
 			a_cOpacity.update(dt, anim::linear);
 		}
@@ -450,6 +449,10 @@ void MediaView::step_state(uint64 ms, bool timer) {
 	}
 }
 
+void MediaView::updateCursor() {
+	setCursor(_controlsState == ControlsHidden ? Qt::BlankCursor : (_over == OverNone ? style::cur_default : style::cur_pointer));
+}
+
 float64 MediaView::radialProgress() const {
 	if (_doc) {
 		return _doc->progress();
@@ -547,6 +550,7 @@ void MediaView::clickHandlerActiveChanged(const ClickHandlerPtr &p, bool active)
 	setCursor((active || ClickHandler::getPressed()) ? style::cur_pointer : style::cur_default);
 	update(QRegion(_saveMsg) + _captionRect);
 }
+
 void MediaView::clickHandlerPressedChanged(const ClickHandlerPtr &p, bool pressed) {
 	setCursor((pressed || ClickHandler::getActive()) ? style::cur_pointer : style::cur_default);
 	update(QRegion(_saveMsg) + _captionRect);
@@ -1317,9 +1321,6 @@ void MediaView::createClipController() {
 	connect(_clipController, SIGNAL(toFullScreenPressed()), this, SLOT(onVideoToggleFullScreen()));
 	connect(_clipController, SIGNAL(fromFullScreenPressed()), this, SLOT(onVideoToggleFullScreen()));
 
-	Sandbox::removeEventFilter(this);
-	Sandbox::installEventFilter(this);
-
 	if (audioPlayer()) {
 		connect(audioPlayer(), SIGNAL(updated(const AudioMsgId&)), this, SLOT(onVideoPlayProgress(const AudioMsgId&)));
 	}
@@ -1403,6 +1404,7 @@ void MediaView::onVideoToggleFullScreen() {
 		setZoomLevel(ZoomToScreenLevel);
 	} else {
 		setZoomLevel(_fullScreenZoomCache);
+		_clipController->showAnimated();
 	}
 
 	_clipController->setInFullScreen(_fullScreenVideo);
@@ -2101,7 +2103,7 @@ void MediaView::mousePressEvent(QMouseEvent *e) {
 			} else if (!_saveMsg.contains(e->pos()) || !_saveMsgStarted) {
 				_pressed = true;
 				_dragging = 0;
-				setCursor(style::cur_default);
+				updateCursor();
 				_mStart = e->pos();
 				_xStart = _x;
 				_yStart = _y;
@@ -2205,10 +2207,8 @@ bool MediaView::updateOverState(OverState newState) {
 				_animOpacities.insert(_over, anim::fvalue(0, 1));
 			}
 			if (!_a_state.animating()) _a_state.start();
-			setCursor(style::cur_pointer);
-		} else {
-			setCursor(style::cur_default);
 		}
+		updateCursor();
 	}
 	return result;
 }
@@ -2438,15 +2438,22 @@ bool MediaView::eventFilter(QObject *obj, QEvent *e) {
 	return TWidget::eventFilter(obj, e);
 }
 
-void MediaView::hide() {
+void MediaView::setVisible(bool visible) {
-	_controlsHideTimer.stop();
+	if (!visible) {
-	_controlsState = ControlsShown;
+		_controlsHideTimer.stop();
-	a_cOpacity = anim::fvalue(1, 1);
+		_controlsState = ControlsShown;
-	TWidget::hide();
+		a_cOpacity = anim::fvalue(1, 1);
-	stopGif();
+	}
-	_radial.stop();
+	TWidget::setVisible(visible);
+	if (visible) {
+		Sandbox::installEventFilter(this);
+	} else {
+		Sandbox::removeEventFilter(this);
 
-	Notify::clipStopperHidden(ClipStopperMediaview);
+		stopGif();
+		_radial.stop();
+		Notify::clipStopperHidden(ClipStopperMediaview);
+	}
 }
 
 void MediaView::onMenuDestroy(QObject *obj) {

Telegram/SourceFiles/mediaview.h

@@ -36,7 +36,7 @@ class MediaView : public TWidget, public RPCSender, public ClickHandlerHost {
 public:
 	MediaView();
 
-	void hide();
+	void setVisible(bool visible) override;
 
 	void updateOver(QPoint mpos);
 
@@ -131,6 +131,7 @@ private:
 	void findCurrent();
 	void loadBack();
 
+	void updateCursor();
 	void setZoomLevel(int newZoom);
 
 	void updateVideoPlaybackState(const AudioPlaybackState &state, bool reset = false);

Telegram/Telegram.xcodeproj/project.pbxproj

@@ -2531,7 +2531,7 @@
 				SDKROOT = macosx;
 				SYMROOT = ./../Mac;
 				TDESKTOP_MAJOR_VERSION = 0.9;
-				TDESKTOP_VERSION = 0.9.59;
+				TDESKTOP_VERSION = 0.9.60;
 			};
 			name = Release;
 		};
@@ -2672,7 +2672,7 @@
 				SDKROOT = macosx;
 				SYMROOT = ./../Mac;
 				TDESKTOP_MAJOR_VERSION = 0.9;
-				TDESKTOP_VERSION = 0.9.59;
+				TDESKTOP_VERSION = 0.9.60;
 			};
 			name = Debug;
 		};

Telegram/build/version

@@ -1,6 +1,6 @@
-AppVersion         9059
+AppVersion         9060
 AppVersionStrMajor 0.9
-AppVersionStrSmall 0.9.59
+AppVersionStrSmall 0.9.60
-AppVersionStr      0.9.59
+AppVersionStr      0.9.60
 AlphaChannel       1
 BetaVersion        0