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

Fix possible crash in MainWindow destructor.

This commit is contained in:
John Preston 2019-03-21 22:21:23 +04:00
parent d1cf43f9a4
commit f1b0b60340
2 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Telegram/SourceFiles/platform/linux/specific_linux.cpp
View File

@ -261,24 +261,22 @@ void finish() {
} }
bool TranslucentWindowsSupported(QPoint globalPosition) { bool TranslucentWindowsSupported(QPoint globalPosition) {
if (auto app = static_cast<QGuiApplication*>(QCoreApplication::instance())) { if (const auto native = QGuiApplication::platformNativeInterface()) {
if (auto native = app->platformNativeInterface()) { if (const auto desktop = QApplication::desktop()) {
if (auto desktop = QApplication::desktop()) { const auto index = desktop->screenNumber(globalPosition);
auto index = desktop->screenNumber(globalPosition); const auto screens = QGuiApplication::screens();
auto screens = QGuiApplication::screens(); if (const auto screen = (index >= 0 && index < screens.size()) ? screens[index] : QGuiApplication::primaryScreen()) {
if (auto screen = (index >= 0 && index < screens.size()) ? screens[index] : QGuiApplication::primaryScreen()) { if (native->nativeResourceForScreen(QByteArray("compositingEnabled"), screen)) {
if (native->nativeResourceForScreen(QByteArray("compositingEnabled"), screen)) { return true;
return true;
}
static OrderedSet<int> WarnedAbout;
if (!WarnedAbout.contains(index)) {
WarnedAbout.insert(index);
LOG(("WARNING: Compositing is disabled for screen index %1 (for position %2,%3)").arg(index).arg(globalPosition.x()).arg(globalPosition.y()));
}
} else {
LOG(("WARNING: Could not get screen for index %1 (for position %2,%3)").arg(index).arg(globalPosition.x()).arg(globalPosition.y()));
} }
static auto WarnedAbout = base::flat_set<int>();
if (!WarnedAbout.contains(index)) {
WarnedAbout.insert(index);
LOG(("WARNING: Compositing is disabled for screen index %1 (for position %2,%3)").arg(index).arg(globalPosition.x()).arg(globalPosition.y()));
}
} else {
LOG(("WARNING: Could not get screen for index %1 (for position %2,%3)").arg(index).arg(globalPosition.x()).arg(globalPosition.y()));
} }
} }
} }

33
Telegram/SourceFiles/platform/win/main_window_win.cpp
View File

@ -767,12 +767,17 @@ void MainWindow::updateIconCounters() {
} }
void MainWindow::initHook() { void MainWindow::initHook() {
auto platformInterface = QGuiApplication::platformNativeInterface(); if (const auto native = QGuiApplication::platformNativeInterface()) {
ps_hWnd = static_cast<HWND>(platformInterface->nativeResourceForWindow(QByteArrayLiteral("handle"), windowHandle())); ps_hWnd = static_cast<HWND>(native->nativeResourceForWindow(
QByteArrayLiteral("handle"),
windowHandle()));
}
if (!ps_hWnd) {
return;
}
if (!ps_hWnd) return; handleSessionNotification = (Dlls::WTSRegisterSessionNotification != nullptr)
&& (Dlls::WTSUnRegisterSessionNotification != nullptr);
handleSessionNotification = (Dlls::WTSRegisterSessionNotification != nullptr) && (Dlls::WTSUnRegisterSessionNotification != nullptr);
if (handleSessionNotification) { if (handleSessionNotification) {
Dlls::WTSRegisterSessionNotification(ps_hWnd, NOTIFY_FOR_THIS_SESSION); Dlls::WTSRegisterSessionNotification(ps_hWnd, NOTIFY_FOR_THIS_SESSION);
} }
@ -914,8 +919,12 @@ void MainWindow::psUpdateMargins() {
_deltaLeft = _deltaTop = _deltaRight = _deltaBottom = 0; _deltaLeft = _deltaTop = _deltaRight = _deltaBottom = 0;
} }
QPlatformNativeInterface *i = QGuiApplication::platformNativeInterface(); if (const auto native = QGuiApplication::platformNativeInterface()) {
i->setWindowProperty(windowHandle()->handle(), qsl("WindowsCustomMargins"), QVariant::fromValue<QMargins>(margins)); native->setWindowProperty(
windowHandle()->handle(),
qsl("WindowsCustomMargins"),
QVariant::fromValue<QMargins>(margins));
}
if (!_themeInited) { if (!_themeInited) {
_themeInited = true; _themeInited = true;
if (QSysInfo::WindowsVersion < QSysInfo::WV_WINDOWS8) { if (QSysInfo::WindowsVersion < QSysInfo::WV_WINDOWS8) {
@ -953,13 +962,11 @@ void MainWindow::psDestroyIcons() {
MainWindow::~MainWindow() { MainWindow::~MainWindow() {
if (handleSessionNotification) { if (handleSessionNotification) {
QPlatformNativeInterface *i = QGuiApplication::platformNativeInterface(); Dlls::WTSUnRegisterSessionNotification(ps_hWnd);
if (HWND hWnd = static_cast<HWND>(i->nativeResourceForWindow(QByteArrayLiteral("handle"), windowHandle()))) { }
Dlls::WTSUnRegisterSessionNotification(hWnd); if (taskbarList) {
} taskbarList.Reset();
} }
if (taskbarList) taskbarList.Reset();
_shadowsWorking = false; _shadowsWorking = false;
if (ps_menu) DestroyMenu(ps_menu); if (ps_menu) DestroyMenu(ps_menu);