diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp
index ad0a3cae5a..fe7986b7d2 100644
--- a/Telegram/SourceFiles/application.cpp
+++ b/Telegram/SourceFiles/application.cpp
@@ -320,7 +320,7 @@ void Application::startApplication() {
}
void Application::closeApplication() {
- if (App::launchState() != App::QuitProcessed);
+ if (App::launchState() == App::QuitProcessed) return;
App::setLaunchState(App::QuitProcessed);
delete AppObject;
diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h
index 9e4060c8b8..83969d1c61 100644
--- a/Telegram/SourceFiles/config.h
+++ b/Telegram/SourceFiles/config.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
*/
#pragma once
-static const int32 AppVersion = 9029;
-static const wchar_t *AppVersionStr = L"0.9.29";
+static const int32 AppVersion = 9030;
+static const wchar_t *AppVersionStr = L"0.9.30";
static const bool DevVersion = true;
//#define BETA_VERSION (9028002ULL) // just comment this line to build public version
diff --git a/Telegram/SourceFiles/history.cpp b/Telegram/SourceFiles/history.cpp
index 412bb0735a..d582b39bda 100644
--- a/Telegram/SourceFiles/history.cpp
+++ b/Telegram/SourceFiles/history.cpp
@@ -6722,7 +6722,7 @@ void HistoryMessage::drawMessageText(Painter &p, QRect trect, uint32 selection)
bool breakEverywhere = (fwd->_text.countHeight(trect.width()) > 2 * serviceFont->height);
textstyleSet(&((selection == FullSelection) ? (outbg ? st::outFwdTextStyleSelected : st::inFwdTextStyleSelected) : (outbg ? st::outFwdTextStyle : st::inFwdTextStyle)));
fwd->_text.drawElided(p, trect.x(), trect.y(), trect.width(), 2, style::al_left, 0, -1, 0, breakEverywhere);
- textstyleRestore();
+ textstyleSet(&(outbg ? st::outTextStyle : st::inTextStyle));
trect.setY(trect.y() + (((fwd->_text.maxWidth() > trect.width()) ? 2 : 1) * serviceFont->height));
}
diff --git a/Telegram/SourceFiles/layerwidget.cpp b/Telegram/SourceFiles/layerwidget.cpp
index 63a1c0ec68..33d91eae39 100644
--- a/Telegram/SourceFiles/layerwidget.cpp
+++ b/Telegram/SourceFiles/layerwidget.cpp
@@ -197,6 +197,7 @@ StickerPreviewWidget::StickerPreviewWidget(QWidget *parent) : TWidget(parent)
, _gif(0)
, _cacheStatus(CacheNotLoaded) {
setAttribute(Qt::WA_TransparentForMouseEvents);
+ connect(App::wnd(), SIGNAL(imageLoaded()), this, SLOT(update()));
}
void StickerPreviewWidget::paintEvent(QPaintEvent *e) {
diff --git a/Telegram/SourceFiles/shortcuts.cpp b/Telegram/SourceFiles/shortcuts.cpp
index dd395f8804..149bea95e2 100644
--- a/Telegram/SourceFiles/shortcuts.cpp
+++ b/Telegram/SourceFiles/shortcuts.cpp
@@ -287,6 +287,7 @@ namespace Shortcuts {
LOG(("Warning: could not find shortcut command handler '%1'").arg(command));
} else {
QShortcut *shortcut(new QShortcut(seq, App::wnd(), nullptr, nullptr, Qt::ApplicationShortcut));
+ shortcut->setAutoRepeat(false);
int shortcutId = shortcut->id();
if (!shortcutId) {
DataPtr->errors.push_back(qsl("Could not create shortcut '%1'!").arg(keys));
diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist
index d4df84bc4c..d5ad09d52f 100644
--- a/Telegram/Telegram.plist
+++ b/Telegram/Telegram.plist
@@ -11,7 +11,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 0.9.29
+ 0.9.30
CFBundleSignature
????
CFBundleURLTypes
diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc
index 4a040b9720..2e6ffef053 100644
--- a/Telegram/Telegram.rc
+++ b/Telegram/Telegram.rc
@@ -34,8 +34,8 @@ IDI_ICON1 ICON "SourceFiles\\art\\icon256.ico"
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,9,29,0
- PRODUCTVERSION 0,9,29,0
+ FILEVERSION 0,9,30,0
+ PRODUCTVERSION 0,9,30,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -51,10 +51,10 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "Telegram Messenger LLP"
- VALUE "FileVersion", "0.9.29.0"
+ VALUE "FileVersion", "0.9.30.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2016"
VALUE "ProductName", "Telegram Desktop"
- VALUE "ProductVersion", "0.9.29.0"
+ VALUE "ProductVersion", "0.9.30.0"
END
END
BLOCK "VarFileInfo"
diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj
index f33e49f056..339fc41cfb 100644
--- a/Telegram/Telegram.xcodeproj/project.pbxproj
+++ b/Telegram/Telegram.xcodeproj/project.pbxproj
@@ -1726,7 +1726,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 0.9.29;
+ CURRENT_PROJECT_VERSION = 0.9.30;
DEBUG_INFORMATION_FORMAT = dwarf;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
@@ -1745,7 +1745,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = YES;
- CURRENT_PROJECT_VERSION = 0.9.29;
+ CURRENT_PROJECT_VERSION = 0.9.30;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_OPTIMIZATION_LEVEL = fast;
GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
@@ -1774,10 +1774,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 0.9.29;
+ CURRENT_PROJECT_VERSION = 0.9.30;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 0.9;
- DYLIB_CURRENT_VERSION = 0.9.29;
+ DYLIB_CURRENT_VERSION = 0.9.30;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -1915,10 +1915,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 0.9.29;
+ CURRENT_PROJECT_VERSION = 0.9.30;
DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 0.9;
- DYLIB_CURRENT_VERSION = 0.9.29;
+ DYLIB_CURRENT_VERSION = 0.9.30;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
FRAMEWORK_SEARCH_PATHS = "";
diff --git a/Telegram/Version b/Telegram/Version
index a89b5197dd..cb02af01c5 100644
--- a/Telegram/Version
+++ b/Telegram/Version
@@ -1,6 +1,6 @@
-AppVersion 9029
+AppVersion 9030
AppVersionStrMajor 0.9
-AppVersionStrSmall 0.9.29
-AppVersionStr 0.9.29
+AppVersionStrSmall 0.9.30
+AppVersionStr 0.9.30
DevChannel 1
BetaVersion 0 9028002