procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

some crashes fixed, 0.9.34 dev version

This commit is contained in:
John Preston 2016-03-16 16:29:44 +03:00
parent c8f2f6bc2b
commit b9616bdf75
8 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Telegram/SourceFiles/boxes/photosendbox.cpp
View File

@ -69,8 +69,8 @@ PhotoSendBox::PhotoSendBox(const FileLoadResultPtr &file) : AbstractBox(st::boxW
if (_animated) { if (_animated) {
int32 limitW = width() - st::boxPhotoPadding.left() - st::boxPhotoPadding.right(); int32 limitW = width() - st::boxPhotoPadding.left() - st::boxPhotoPadding.right();
int32 limitH = st::confirmMaxHeight; int32 limitH = st::confirmMaxHeight;
maxW = dimensions.width(); maxW = qMax(dimensions.width(), 1);
maxH = dimensions.height(); maxH = qMax(dimensions.height(), 1);
if (maxW * limitH > maxH * limitW) { if (maxW * limitH > maxH * limitW) {
if (maxW < limitW) { if (maxW < limitW) {
maxH = maxH * limitW / maxW; maxH = maxH * limitW / maxW;
@ -446,8 +446,8 @@ EditCaptionBox::EditCaptionBox(HistoryItem *msg) : AbstractBox(st::boxWideWidth)
if (_animated) { if (_animated) {
int32 limitW = width() - st::boxPhotoPadding.left() - st::boxPhotoPadding.right(); int32 limitW = width() - st::boxPhotoPadding.left() - st::boxPhotoPadding.right();
int32 limitH = st::confirmMaxHeight; int32 limitH = st::confirmMaxHeight;
maxW = dimensions.width(); maxW = qMax(dimensions.width(), 1);
maxH = dimensions.height(); maxH = qMax(dimensions.height(), 1);
if (maxW * limitH > maxH * limitW) { if (maxW * limitH > maxH * limitW) {
if (maxW < limitW) { if (maxW < limitW) {
maxH = maxH * limitW / maxW; maxH = maxH * limitW / maxW;

6
Telegram/SourceFiles/config.h
View File

@ -20,9 +20,9 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
*/ */
#pragma once #pragma once
static const int32 AppVersion = 9033; static const int32 AppVersion = 9034;
static const wchar_t *AppVersionStr = L"0.9.33"; static const wchar_t *AppVersionStr = L"0.9.34";
static const bool DevVersion = false; static const bool DevVersion = true;
//#define BETA_VERSION (9030002ULL) // just comment this line to build public version //#define BETA_VERSION (9030002ULL) // just comment this line to build public version
static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)"; static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)";

2
Telegram/SourceFiles/gui/popupmenu.cpp
View File

@ -561,7 +561,7 @@ void PopupTooltip::onShow() {
} }
void PopupTooltip::onWndActiveChanged() { void PopupTooltip::onWndActiveChanged() {
if (!App::wnd()->windowHandle()->isActive()) { if (!App::wnd() || !App::wnd()->windowHandle() || !App::wnd()->windowHandle()->isActive()) {
PopupTooltip::Hide(); PopupTooltip::Hide();
} }
} }

22
Telegram/SourceFiles/history.cpp
View File

@ -1118,7 +1118,9 @@ bool DialogsList::del(const PeerId &peerId, DialogRow *replacedBy) {
if (i == rowByPeer.cend()) return false; if (i == rowByPeer.cend()) return false;
DialogRow *row = i.value(); DialogRow *row = i.value();
emit App::main()->dialogRowReplaced(row, replacedBy); if (App::main()) {
emit App::main()->dialogRowReplaced(row, replacedBy);
}
if (row == current) { if (row == current) {
current = row->next; current = row->next;
@ -6179,7 +6181,7 @@ HistoryMessage::HistoryMessage(History *history, HistoryBlock *block, MsgId id,
, _text(st::msgMinWidth) , _text(st::msgMinWidth)
, _textWidth(0) , _textWidth(0)
, _textHeight(0) , _textHeight(0)
, _media(0) { , _media(nullptr) {
UserData *fwdViaBot = fwd->viaBot(); UserData *fwdViaBot = fwd->viaBot();
int32 viaBotId = fwdViaBot ? peerToUser(fwdViaBot->id) : 0; int32 viaBotId = fwdViaBot ? peerToUser(fwdViaBot->id) : 0;
int32 fwdViewsCount = fwd->viewsCount(), views = (fwdViewsCount > 0) ? fwdViewsCount : (isPost() ? 1 : -1); int32 fwdViewsCount = fwd->viewsCount(), views = (fwdViewsCount > 0) ? fwdViewsCount : (isPost() ? 1 : -1);
@ -6197,7 +6199,7 @@ HistoryMessage::HistoryMessage(History *history, HistoryBlock *block, MsgId id,
, _text(st::msgMinWidth) , _text(st::msgMinWidth)
, _textWidth(0) , _textWidth(0)
, _textHeight(0) , _textHeight(0)
, _media(0) { , _media(nullptr) {
create((flags & MTPDmessage::flag_via_bot_id) ? viaBotId : 0, isPost() ? 1 : -1); create((flags & MTPDmessage::flag_via_bot_id) ? viaBotId : 0, isPost() ? 1 : -1);
setText(msg, entities); setText(msg, entities);
@ -6208,7 +6210,7 @@ HistoryItem(history, block, msgId, flags, date, (flags & MTPDmessage::flag_from_
, _text(st::msgMinWidth) , _text(st::msgMinWidth)
, _textWidth(0) , _textWidth(0)
, _textHeight(0) , _textHeight(0)
, _media(0) { , _media(nullptr) {
create((flags & MTPDmessage::flag_via_bot_id) ? viaBotId : 0, isPost() ? 1 : -1); create((flags & MTPDmessage::flag_via_bot_id) ? viaBotId : 0, isPost() ? 1 : -1);
initMediaFromDocument(doc, caption); initMediaFromDocument(doc, caption);
@ -6220,7 +6222,7 @@ HistoryItem(history, block, msgId, flags, date, (flags & MTPDmessage::flag_from_
, _text(st::msgMinWidth) , _text(st::msgMinWidth)
, _textWidth(0) , _textWidth(0)
, _textHeight(0) , _textHeight(0)
, _media(0) { , _media(nullptr) {
create((flags & MTPDmessage::flag_via_bot_id) ? viaBotId : 0, isPost() ? 1 : -1); create((flags & MTPDmessage::flag_via_bot_id) ? viaBotId : 0, isPost() ? 1 : -1);
_media = new HistoryPhoto(photo, caption, this); _media = new HistoryPhoto(photo, caption, this);
@ -6516,8 +6518,10 @@ void HistoryMessage::setMedia(const MTPMessageMedia *media) {
bool mediaWasDisplayed = false; bool mediaWasDisplayed = false;
if (_media) { if (_media) {
mediaWasDisplayed = _media->isDisplayed(); mediaWasDisplayed = _media->isDisplayed();
_media->unregItem(this);
delete _media; delete _media;
_media = 0; _media = nullptr;
} }
QString t; QString t;
initMedia(media, t); initMedia(media, t);
@ -7504,6 +7508,7 @@ void HistoryServiceMsg::setMessageByAction(const MTPmessageAction &action) {
const MTPDmessageActionChatEditPhoto &d(action.c_messageActionChatEditPhoto()); const MTPDmessageActionChatEditPhoto &d(action.c_messageActionChatEditPhoto());
if (d.vphoto.type() == mtpc_photo) { if (d.vphoto.type() == mtpc_photo) {
_media = new HistoryPhoto(history()->peer, d.vphoto.c_photo(), st::msgServicePhotoWidth); _media = new HistoryPhoto(history()->peer, d.vphoto.c_photo(), st::msgServicePhotoWidth);
_media->regItem(this);
} }
text = isPost() ? lang(lng_action_changed_photo_channel) : lng_action_changed_photo(lt_from, from); text = isPost() ? lang(lng_action_changed_photo_channel) : lng_action_changed_photo(lt_from, from);
} break; } break;
@ -7879,7 +7884,10 @@ HistoryServiceMsg::~HistoryServiceMsg() {
App::historyUnregDependency(this, pinned->msg); App::historyUnregDependency(this, pinned->msg);
} }
} }
deleteAndMark(_media); if (_media) {
_media->unregItem(this);
deleteAndMark(_media);
}
} }
HistoryDateMsg::HistoryDateMsg(History *history, HistoryBlock *block, const QDate &date) : HistoryDateMsg::HistoryDateMsg(History *history, HistoryBlock *block, const QDate &date) :

2
Telegram/Telegram.plist
View File

@ -11,7 +11,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>0.9.32</string> <string>0.9.34</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleURLTypes</key> <key>CFBundleURLTypes</key>

8
Telegram/Telegram.rc
View File

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

12
Telegram/Telegram.xcodeproj/project.pbxproj
View File

@ -1726,7 +1726,7 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.9.32; CURRENT_PROJECT_VERSION = 0.9.34;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
@ -1745,7 +1745,7 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 0.9.32; CURRENT_PROJECT_VERSION = 0.9.34;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_OPTIMIZATION_LEVEL = fast; GCC_OPTIMIZATION_LEVEL = fast;
GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h; GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
@ -1774,10 +1774,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = ""; CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.9.32; CURRENT_PROJECT_VERSION = 0.9.34;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 0.9; DYLIB_COMPATIBILITY_VERSION = 0.9;
DYLIB_CURRENT_VERSION = 0.9.32; DYLIB_CURRENT_VERSION = 0.9.34;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = ""; FRAMEWORK_SEARCH_PATHS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@ -1915,10 +1915,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = ""; CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.9.32; CURRENT_PROJECT_VERSION = 0.9.34;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 0.9; DYLIB_COMPATIBILITY_VERSION = 0.9;
DYLIB_CURRENT_VERSION = 0.9.32; DYLIB_CURRENT_VERSION = 0.9.34;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES; ENABLE_TESTABILITY = YES;
FRAMEWORK_SEARCH_PATHS = ""; FRAMEWORK_SEARCH_PATHS = "";

8
Telegram/Version
View File

@ -1,6 +1,6 @@
AppVersion 9033 AppVersion 9034
AppVersionStrMajor 0.9 AppVersionStrMajor 0.9
AppVersionStrSmall 0.9.33 AppVersionStrSmall 0.9.34
AppVersionStr 0.9.33 AppVersionStr 0.9.34
DevChannel 0 DevChannel 1
BetaVersion 0 9030002 BetaVersion 0 9030002