MrBesen/tdesktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix crash in event loop nesting.

Browse Source
This commit is contained in:
John Preston 2019-04-07 10:59:37 +04:00
parent a0926f2d70
commit 6c17ed2242
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Telegram/SourceFiles/platform/mac/specific_mac.mm
View File

@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "mainwidget.h"
#include "history/history_widget.h"
#include "core/crash_reports.h"
#include "core/sandbox.h"
#include "storage/localstorage.h"
#include "mainwindow.h"
#include "history/history_location_manager.h"
@ -38,10 +39,12 @@ public:
}
bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) {
auto wnd = App::wnd();
if (!wnd) return false;
return Core::Sandbox::Instance().customEnterFromEventLoop([&] {
auto wnd = App::wnd();
if (!wnd) return false;
return wnd->psFilterNativeEvent(message);
return wnd->psFilterNativeEvent(message);
});
}
};

9
Telegram/SourceFiles/platform/mac/specific_mac_p.mm
View File

@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "mainwindow.h"
#include "mainwidget.h"
#include "core/sandbox.h"
#include "core/application.h"
#include "core/crash_reports.h"
#include "storage/localstorage.h"
@ -184,9 +185,11 @@ ApplicationDelegate *_sharedDelegate = nil;
}
- (void) mediaKeyTap:(SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)e {
if (e && [e type] == NSSystemDefined && [e subtype] == SPSystemDefinedEventMediaKeys) {
objc_handleMediaKeyEvent(e);
}
Core::Sandbox::Instance().customEnterFromEventLoop([&] {
if (e && [e type] == NSSystemDefined && [e subtype] == SPSystemDefinedEventMediaKeys) {
objc_handleMediaKeyEvent(e);
}
});
}
- (void) ignoreApplicationActivationRightNow {

2
Telegram/SourceFiles/ui/effects/animations.h
View File

@ -15,6 +15,8 @@ class Manager;
class Basic final {
public:
Basic() = default;
Basic(const Basic &other) = delete;
Basic &operator=(const Basic &other) = delete;
template <typename Callback>
explicit Basic(Callback &&callback);