Fix crash on right clicking emoji button with third column
This commit is contained in:
parent
60ab760d39
commit
1d1676de2e
2 changed files with 2 additions and 2 deletions
|
|
@ -1018,7 +1018,7 @@ void HistoryWidget::initTabbedSelector() {
|
||||||
});
|
});
|
||||||
|
|
||||||
base::install_event_filter(_tabbedSelectorToggle, [=](not_null<QEvent*> e) {
|
base::install_event_filter(_tabbedSelectorToggle, [=](not_null<QEvent*> e) {
|
||||||
if (e->type() == QEvent::ContextMenu && !HoverEmojiPanel()) {
|
if (e->type() == QEvent::ContextMenu && !HoverEmojiPanel() && _tabbedPanel) {
|
||||||
_tabbedPanel->toggleAnimated();
|
_tabbedPanel->toggleAnimated();
|
||||||
return base::EventFilterResult::Cancel;
|
return base::EventFilterResult::Cancel;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1498,7 +1498,7 @@ void ComposeControls::initTabbedSelector() {
|
||||||
}
|
}
|
||||||
|
|
||||||
base::install_event_filter(_tabbedSelectorToggle, [=](not_null<QEvent*> e) {
|
base::install_event_filter(_tabbedSelectorToggle, [=](not_null<QEvent*> e) {
|
||||||
if (e->type() == QEvent::ContextMenu && !HoverEmojiPanel()) {
|
if (e->type() == QEvent::ContextMenu && !HoverEmojiPanel() && _tabbedPanel) {
|
||||||
_tabbedPanel->toggleAnimated();
|
_tabbedPanel->toggleAnimated();
|
||||||
return base::EventFilterResult::Cancel;
|
return base::EventFilterResult::Cancel;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue