RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into dev

This commit is contained in:
John Preston 2016-02-07 13:51:47 +03:00
parent dd0c79ee56 db9f47c6f2
commit 980b50f8cf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/window.cpp
View File

@ -435,7 +435,7 @@ void Window::init() {
psInitFrameless(); psInitFrameless();
setWindowIcon(wndIcon); setWindowIcon(wndIcon);
App::app()->installEventFilter(this); Application::instance()->installEventFilter(this);
connect(windowHandle(), SIGNAL(windowStateChanged(Qt::WindowState)), this, SLOT(stateChanged(Qt::WindowState))); connect(windowHandle(), SIGNAL(windowStateChanged(Qt::WindowState)), this, SLOT(stateChanged(Qt::WindowState)));
connect(windowHandle(), SIGNAL(activeChanged()), this, SLOT(checkHistoryActivation()), Qt::QueuedConnection); connect(windowHandle(), SIGNAL(activeChanged()), this, SLOT(checkHistoryActivation()), Qt::QueuedConnection);
@ -2156,7 +2156,7 @@ QString LastCrashedWindow::getReportField(const QLatin1String &name, const QLati
if (name == qstr("version")) { if (name == qstr("version")) {
if (data.endsWith(qstr(" beta"))) { if (data.endsWith(qstr(" beta"))) {
data = QString::number(-data.replace(QRegularExpression(qsl("[^\\d]")), "").mid(0, data.size() - 5).toLongLong()); data = QString::number(-data.replace(QRegularExpression(qsl("[^\\d]")), "").toLongLong());
} else { } else {
data = QString::number(data.replace(QRegularExpression(qsl("[^\\d]")), "").toLongLong()); data = QString::number(data.replace(QRegularExpression(qsl("[^\\d]")), "").toLongLong());
} }