random tweaks to mousehook and codepanerefactorrenamecommand

retailcoder · Apr 21, 2016 · d30906f · d30906f
1 parent 6791992
commit d30906f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/RetailCoder.VBE/App.cs b/RetailCoder.VBE/App.cs
@@ -17,8 +17,6 @@
 using Rubberduck.UI.Command.MenuItems;
 using Infralution.Localization.Wpf;
 using Rubberduck.Common.Dispatch;
-using Rubberduck.Common.Hotkeys;
-using Rubberduck.VBEditor.VBEInterfaces.RubberduckCodePane;
 
 namespace Rubberduck
 {

diff --git a/RetailCoder.VBE/Common/MouseHook.cs b/RetailCoder.VBE/Common/MouseHook.cs
@@ -71,6 +71,7 @@ public void Attach()
             _hookId = User32.SetWindowsHookEx(WindowsHook.MOUSE_LL, _callback, handle, 0);
             if (_hookId == IntPtr.Zero)
             {
+                IsAttached = false;
                 throw new Win32Exception();
             }
 
@@ -86,7 +87,7 @@ public void Detach()
             }
 
             IsAttached = false;
-            if (!User32.UnhookWindowsHookEx(_hookId))
+            if (_hookId != IntPtr.Zero && !User32.UnhookWindowsHookEx(_hookId))
             {
                 _hookId = IntPtr.Zero;
                 throw new Win32Exception();

diff --git a/RetailCoder.VBE/UI/Command/Refactorings/CodePaneRefactorRenameCommand.cs b/RetailCoder.VBE/UI/Command/Refactorings/CodePaneRefactorRenameCommand.cs
@@ -47,8 +47,7 @@ public override void Execute(object parameter)
             }
             else
             {
-                var selection = Vbe.ActiveCodePane.GetSelection();
-                target = _state.AllUserDeclarations.FindTarget(selection);
+                target = _state.FindSelectedDeclaration(Vbe.ActiveCodePane);
             }
 
             if (target == null)