Merge pull request #98 from ezweave/master

pre migrating the SWTUtil class over, I added isDisposed checks to the f...
ReadyTalk · Mar 4, 2014 · 136b18d · 136b18d
2 parents 3b0225a + bc9a799
commit 136b18d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 # Project details
 group=com.readytalk
-version=2.1.3
+version=2.1.4
 
 
 # Optimize the build environment

diff --git a/src/main/java/com/readytalk/swt/widgets/notifications/PopOverShell.java b/src/main/java/com/readytalk/swt/widgets/notifications/PopOverShell.java
@@ -367,10 +367,11 @@ private Point getPopOverLocationControlOffscreen(Rectangle displayBounds,
    * @return Visibility state of the PopOverShell
    */
   public boolean isVisible() {
-    if (popOverShell == null){
-      return false;
+    boolean isVisible = false;
+    if (popOverShell != null && !popOverShell.isDisposed()){
+      isVisible = popOverShell.isVisible();
     }
-    return popOverShell.isVisible();
+    return isVisible;
   }
 
   /**
@@ -412,7 +413,7 @@ public boolean getIsFadeEffectInProgress() {
   public boolean fadeComplete(int targetAlpha) {
     synchronized (fadeLock) {
       boolean isFadeComplete = false;
-      if (popOverShell == null || popOverShell.getAlpha() == targetAlpha) {
+      if (popOverShell == null || popOverShell.isDisposed() || popOverShell.getAlpha() == targetAlpha) {
         isFadeComplete =  true;
       }