Fixed a small bug. When no image is selected and the user clicks on the canvas,

mouseDown gets called. I wasn't checking to see if the image is not null and
still checking if the mouse was clicked within the bounds of the image.

1 files changed, 7 insertions, 4 deletions

diff --git a/java/ImageProcessing/framework/ImageCanvas.java b/java/ImageProcessing/framework/ImageCanvas.java
index f527accf545..182bd54bf9b 100644
--- a/java/ImageProcessing/framework/ImageCanvas.java
+++ b/java/ImageProcessing/framework/ImageCanvas.java
@@ -143,10 +143,13 @@ class ImageCanvas extends Canvas
   // Check if  mouse is within the bounds of the image
   private boolean inBounds (int x, int y)
   {
-    return (x >= this.x_) &&
-           (y >= this.y_) &&
-           (x <= (this.x_ + this.zoom_ * this.image_.getWidth (this))) &&
-           (y <= (this.y_ + this.zoom_ * this.image_.getHeight (this)));
+    if (this.image_ == null)
+      return false;
+    else
+      return (x >= this.x_) &&
+	     (y >= this.y_) &&
+             (x <= (this.x_ + this.zoom_ * this.image_.getWidth (this))) &&
+             (y <= (this.y_ + this.zoom_ * this.image_.getHeight (this)));
   }
 
   private MediaTracker tracker_ = new MediaTracker(this);