Skip to content

Fixed merge-conflicts #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 1, 2016
Merged

Fixed merge-conflicts #65

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions RetailCoder.VBE/Common/RubberduckHooks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,11 +170,11 @@ private IntPtr WindowProc(IntPtr hWnd, uint uMsg, IntPtr wParam, IntPtr lParam)
private bool HandleHotkeyMessage(IntPtr wParam)
{
var processed = false;
if (GetWindowThread(User32.GetForegroundWindow()) == GetWindowThread(_mainWindowHandle))
{
var hook = Hooks.OfType<Hotkey>().SingleOrDefault(k => k.HotkeyInfo.HookId == (IntPtr) wParam);
if (hook != null)
{
if (GetWindowThread(User32.GetForegroundWindow()) == GetWindowThread(_mainWindowHandle))
{
var hook = Hooks.OfType<Hotkey>().SingleOrDefault(k => k.HotkeyInfo.HookId == wParam);
if (hook != null)
{
hook.OnMessageReceived();
processed = true;
}
Expand Down Expand Up @@ -214,4 +214,4 @@ private IntPtr GetWindowThread(IntPtr hWnd)
return (IntPtr)hThread;
}
}
}
}