Don't let the app control itself, it only leads to accidents or mouse bugs. Don't...

diff --git a/Classes/NJDeviceController.m b/Classes/NJDeviceController.m
index 39ec389f1734633504e4a1a76fc54446507242ea..0b0fe9289c30fa9267f6335e3eed9ff410b206e0 100644 (file)
--- 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 0ea7a9589bf39ed39b174fbd237359685d5e3f9b..ed9e83f47b56c8974f9dfa83c14ab14a8bdded3c 100644 (file)
--- 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 5436540656e98e853a0d5dcb28924d709941fde8..f52c5b666a7ec8d0c80c7fa27ce6ac3685bb0bc2 100644 (file)
--- 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 961e84c7f390db1bc8d18174b9877816268523c9..3506443c0f7e041ec300246ed1bc9e9d527932be 100644 (file)
--- 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>