Permalink
Browse files

Fixed bug when merging commit 4bcb926

  • Loading branch information...
1 parent b003b6b commit d898106fca5198af25dcbb022968869fdc907315 @iMasanari committed Dec 19, 2016
Showing with 4 additions and 4 deletions.
  1. +2 −2 cmd-eikana/Info.plist
  2. +2 −2 cmd-eikana/KeyEvent.swift
@@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.1.3</string>
+ <string>2.2.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
@@ -34,7 +34,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>12</string>
+ <string>13</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>LSUIElement</key>
@@ -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)

0 comments on commit d898106

Please sign in to comment.