From: Joe Wreschnig <joe.wreschnig@gmail.com>
Date: Thu, 14 Mar 2013 20:10:22 +0000 (+0100)
Subject: Don't let the app control itself, it only leads to accidents or mouse bugs. Don't... 
X-Git-Tag: version-1.1~26
X-Git-Url: https://git.yukkurigames.com/?a=commitdiff_plain;h=6dddafbcf505939751ddb2d66ffb586d150aaaa8;p=enjoyable.git

Don't let the app control itself, it only leads to accidents or mouse bugs. Don't auto-focus the key field when simulating either.
---

diff --git a/Classes/NJDeviceController.m b/Classes/NJDeviceController.m
index 39ec389..0b0fe92 100644
--- a/Classes/NJDeviceController.m
+++ b/Classes/NJDeviceController.m
@@ -138,13 +138,15 @@
     [self expandRecursive:handler];
     [outlineView selectRowIndexes:[NSIndexSet indexSetWithIndex:[outlineView rowForItem:handler]]
              byExtendingSelection: NO];
-    [outputController focusKey];
+    if (!self.simulatingEvents)
+        [outputController focusKey];
 }
 
 - (void)hidManager:(NJHIDManager *)manager
       valueChanged:(IOHIDValueRef)value
         fromDevice:(IOHIDDeviceRef)device {
-    if (self.simulatingEvents) {
+    if (self.simulatingEvents
+        && !NSApplication.sharedApplication.isActive) {
         [self runOutputForDevice:device value:value];
     } else {
         [self showOutputForDevice:device value:value];
diff --git a/Info.plist b/Info.plist
index 0ea7a95..ed9e83f 100644
--- a/Info.plist
+++ b/Info.plist
@@ -46,7 +46,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>298</string>
+	<string>301</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/Resources/Help/Contents/Resources/English.lproj/pgs/mouse.html b/Resources/Help/Contents/Resources/English.lproj/pgs/mouse.html
index 5436540..f52c5b6 100644
--- a/Resources/Help/Contents/Resources/English.lproj/pgs/mouse.html
+++ b/Resources/Help/Contents/Resources/English.lproj/pgs/mouse.html
@@ -76,15 +76,5 @@
       change this globally in <b> > System Preferences… > Mouse</b>
       and <b> > System Preferences… > Trackpad</b>.
     </p>
-    
-    <h3><a name="mouseissues"></a>Known Issues</h3>
-    <p>
-      Enjoyable is unable to send most mouse events to itself - the
-      application will freeze until you click on it with a real mouse
-      or touchpad. If you find another appliation that has problems
-      with Enjoyable's mouse support <a
-      href="https://github.com/joewreschnig/enjoyable/issues">please
-      file a ticket in the issue tracker</a>.
-    </p>    
   </body>
 </html>
diff --git a/Resources/Help/Contents/Resources/English.lproj/pgs/whatsnew.html b/Resources/Help/Contents/Resources/English.lproj/pgs/whatsnew.html
index 961e84c..3506443 100644
--- a/Resources/Help/Contents/Resources/English.lproj/pgs/whatsnew.html
+++ b/Resources/Help/Contents/Resources/English.lproj/pgs/whatsnew.html
@@ -59,6 +59,11 @@
               Enjoyable uses fewer resources when running in the
               background.
             </li>
+            <li>
+              To prevent accidentally rebinding keys right after
+              enabling simulation, Enjoyable can no longer control
+              itself.
+            </li>
         </ul>
     </body>
 </html>