starred/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2026-02-07 21:25:41 +00:00
Code Issues 19.0k Packages Projects Releases 20 Wiki Activity

Fix a crash in the rclick context menu (#15079)

Browse Source 
Due to a bad merge a few commits back. This event should have had a
revoker.

Probably regressed in #14851
This commit is contained in:
Mike Griese
2023-03-31 15:49:12 -05:00
committed by GitHub
parent 984b03ca33
commit bbd4d1b1e4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/cascadia/TerminalControl/TermControl.cpp
View File

@@ -94,6 +94,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
_revokers.coreOpenHyperlink = _core.OpenHyperlink(winrt::auto_revoke, { get_weak(), &TermControl::_HyperlinkHandler });
_revokers.interactivityOpenHyperlink = _interactivity.OpenHyperlink(winrt::auto_revoke, { get_weak(), &TermControl::_HyperlinkHandler });
_revokers.interactivityScrollPositionChanged = _interactivity.ScrollPositionChanged(winrt::auto_revoke, { get_weak(), &TermControl::_ScrollPositionChanged });
_revokers.ContextMenuRequested = _interactivity.ContextMenuRequested(winrt::auto_revoke, { get_weak(), &TermControl::_contextMenuHandler });
// "Bubbled" events - ones we want to handle, by raising our own event.
_revokers.CopyToClipboard = _core.CopyToClipboard(winrt::auto_revoke, { get_weak(), &TermControl::_bubbleCopyToClipboard });
@@ -106,8 +107,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
_revokers.PasteFromClipboard = _interactivity.PasteFromClipboard(winrt::auto_revoke, { get_weak(), &TermControl::_bubblePasteFromClipboard });
_interactivity.ContextMenuRequested({ this, &TermControl::_contextMenuHandler });
// Initialize the terminal only once the swapchainpanel is loaded - that
// way, we'll be able to query the real pixel size it got on layout
_layoutUpdatedRevoker = SwapChainPanel().LayoutUpdated(winrt::auto_revoke, [this](auto /*s*/, auto /*e*/) {

1
src/cascadia/TerminalControl/TermControl.h
View File

@@ -373,6 +373,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
Control::ControlInteractivity::OpenHyperlink_revoker interactivityOpenHyperlink;
Control::ControlInteractivity::ScrollPositionChanged_revoker interactivityScrollPositionChanged;
Control::ControlInteractivity::PasteFromClipboard_revoker PasteFromClipboard;
Control::ControlInteractivity::ContextMenuRequested_revoker ContextMenuRequested;
} _revokers{};
};
}