Check for null to revise #297

phrack · Nov 22, 2015 · ffea550 · ffea550
1 parent fc9d779
commit ffea550
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/src/main/java/com/shootoff/camera/CameraManager.java b/src/main/java/com/shootoff/camera/CameraManager.java
@@ -600,7 +600,7 @@ private void showMissingCameraError() {
 				cameraAlert.setHeaderText("Cannot Communicate with Camera!");
 				cameraAlert.setResizable(true);
 				cameraAlert.setContentText(message);
-				cameraAlert.initOwner(controller.getStage());
+				if (controller != null) cameraAlert.initOwner(controller.getStage());
 				cameraAlert.show();
 			});
 		}
@@ -623,7 +623,7 @@ private void showFPSWarning(double fps) {
 				cameraAlert.setHeaderText("Webcam FPS is too low!");
 				cameraAlert.setResizable(true);
 				cameraAlert.setContentText(message);
-				cameraAlert.initOwner(controller.getStage());
+				if (controller != null) cameraAlert.initOwner(controller.getStage());
 				cameraAlert.show();
 			});
 		}
@@ -686,7 +686,7 @@ public void run() {
 			brightnessAlert.setHeaderText("Webcam detected very bright conditions!");
 			brightnessAlert.setResizable(true);
 			brightnessAlert.setContentText(message);
-			brightnessAlert.initOwner(controller.getStage());
+			if (controller != null) brightnessAlert.initOwner(controller.getStage());
 			brightnessAlert.show();
 		});
 	}
@@ -737,6 +737,4 @@ public void disableAutoCalibration() {
 	public void setController(ShootOFFController controller) {
 		this.controller = controller;
 	}
-
-
 }