From d898106fca5198af25dcbb022968869fdc907315 Mon Sep 17 00:00:00 2001
From: iMasanari <14dd023@gmail.com>
Date: Mon, 19 Dec 2016 16:21:19 +0900
Subject: [PATCH] Fixed bug when merging commit 4bcb926
---
cmd-eikana/Info.plist | 4 ++--
cmd-eikana/KeyEvent.swift | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cmd-eikana/Info.plist b/cmd-eikana/Info.plist
index 641e6c8..f7441e1 100644
--- a/cmd-eikana/Info.plist
+++ b/cmd-eikana/Info.plist
@@ -17,7 +17,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 2.1.3
+ 2.2.0
CFBundleSignature
????
CFBundleURLTypes
@@ -34,7 +34,7 @@
CFBundleVersion
- 12
+ 13
LSMinimumSystemVersion
$(MACOSX_DEPLOYMENT_TARGET)
LSUIElement
diff --git a/cmd-eikana/KeyEvent.swift b/cmd-eikana/KeyEvent.swift
index 182d196..58619d1 100644
--- a/cmd-eikana/KeyEvent.swift
+++ b/cmd-eikana/KeyEvent.swift
@@ -258,7 +258,7 @@ class KeyEvent: NSObject {
func hasConvertedEvent(_ event: CGEvent, keyCode: CGKeyCode? = nil, keyDown: Bool = false) -> Bool {
let event = event.type.rawValue == UInt32(NX_SYSDEFINED) ?
- CGEvent(keyboardEventSource: nil, virtualKey: 0, keyDown: keyDown)! : event.copy()!
+ CGEvent(keyboardEventSource: nil, virtualKey: 0, keyDown: keyDown)! : event
let shortcht = KeyboardShortcut(event)
@@ -275,7 +275,7 @@ class KeyEvent: NSObject {
}
func getConvertedEvent(_ event: CGEvent, keyCode: CGKeyCode? = nil, keyDown: Bool = false) -> CGEvent? {
let event = event.type.rawValue == UInt32(NX_SYSDEFINED) ?
- CGEvent(keyboardEventSource: nil, virtualKey: 0, keyDown: keyDown)! : event.copy()!
+ CGEvent(keyboardEventSource: nil, virtualKey: 0, keyDown: keyDown)! : event
let shortcht = KeyboardShortcut(event)