Merge pull request #58 from cranst0n/0.x

Ensure all MouseEventSource(s) unsubscribe on the EDT. Fixes #57.
ReactiveX · Jan 14, 2016 · a7be147 · a7be147
2 parents 080c6ee + 59b6f70
commit a7be147
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/main/java/rx/swing/sources/MouseEventSource.java b/src/main/java/rx/swing/sources/MouseEventSource.java
@@ -102,7 +102,8 @@ public void call() {
                     }
                 }));
             }
-        }).subscribeOn(SwingScheduler.getInstance());
+        }).subscribeOn(SwingScheduler.getInstance())
+                .unsubscribeOn(SwingScheduler.getInstance());
     }
 
     public static Observable<MouseWheelEvent> fromMouseWheelEvents(final Component component){
@@ -124,7 +125,8 @@ public void call() {
                     }
                 }));
             }
-        }).subscribeOn(SwingScheduler.getInstance());
+        }).subscribeOn(SwingScheduler.getInstance())
+                .unsubscribeOn(SwingScheduler.getInstance());
     }
 
     /**
@@ -137,7 +139,8 @@ public static Observable<Point> fromRelativeMouseMotion(final Component componen
             public Point call(MouseEvent ev1, MouseEvent ev2) {
                 return new Point(ev2.getX() - ev1.getX(), ev2.getY() - ev1.getY());
             }
-        }).subscribeOn(SwingScheduler.getInstance());
+        }).subscribeOn(SwingScheduler.getInstance())
+                .unsubscribeOn(SwingScheduler.getInstance());
     }
 
 }