formのcloseイベントにマウスジェスチャーのアンインストールを

[gikonavigoeson/gikonavi.git] / Editor.pas

diff --git a/Editor.pas b/Editor.pas
index cb31f65..275f8ec 100644 (file)
--- a/Editor.pas
+++ b/Editor.pas
@@ -621,13 +621,6 @@ end;
 procedure TEditorForm.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
        Action := caFree;
-    if GikoSys.Setting.GestureEnabled then begin
-        GikoSys.Setting.Gestures.ClearGesture;
-        MouseGesture.UnHook;
-               MouseGesture.OnGestureStart := nil;
-               MouseGesture.OnGestureMove := nil;
-               MouseGesture.OnGestureEnd := nil;
-    end;
 end;
 
 procedure TEditorForm.FormDestroy(Sender: TObject);
@@ -1746,11 +1739,13 @@ end;
 
 procedure TEditorForm.FormDeactivate(Sender: TObject);
 begin
-       if GikoSys.Setting.GestureEnabled then begin
-               MouseGesture.UnHook;
-               //MouseGesture.SetHook( GikoForm.Handle );
-       end;
-
+    if GikoSys.Setting.GestureEnabled then begin
+        GikoSys.Setting.Gestures.ClearGesture;
+        MouseGesture.UnHook;
+               MouseGesture.OnGestureStart := nil;
+               MouseGesture.OnGestureMove := nil;
+               MouseGesture.OnGestureEnd := nil;
+    end;
 end;
 
 procedure TEditorForm.OnGestureStart(Sender: TObject);