Camera Calibration: Fix hangup and null pointer exception

t-oster · Sep 11, 2018 · af8129d · af8129d
1 parent fe1b60a
commit af8129d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/com/t_oster/visicut/gui/CamCalibrationDialog.java b/src/com/t_oster/visicut/gui/CamCalibrationDialog.java
@@ -119,6 +119,9 @@ public void fetchFreshImage() {
           if (src != null)
           {
             URLConnection conn = src.openConnection();
+            conn.setConnectTimeout(5 * 1000); // 5s connect timeout
+            conn.setReadTimeout(30 * 1000); // 30s read timeout after connecting
+
 
             // HTTP authentication
             if (VisicutModel.getInstance() != null && VisicutModel.getInstance().getSelectedLaserDevice() != null)
@@ -150,6 +153,9 @@ public void fetchFreshImage() {
 
   private void refreshImagePoints()
   {
+    if (backgroundImage == null) {
+      return;
+    }
     int numPriorPoints = 0;
     if (modifiedImagePoints == null) {
       modifiedImagePoints = new Point2D.Double[numAlignmentPoints];

diff --git a/src/com/t_oster/visicut/misc/DialogHelper.java b/src/com/t_oster/visicut/misc/DialogHelper.java
@@ -266,6 +266,8 @@ public static String getHumanReadableErrorMessage(Throwable cause, String text,
     boolean emptyMessage = cause.getMessage() == null || cause.getMessage().trim().length() == 0;
     if (alwaysShowStacktrace ||
         cause.getClass().equals(NullPointerException.class) ||
+        cause.getClass().equals(ArrayIndexOutOfBoundsException.class) ||
+        cause.getClass().equals(ClassCastException.class) ||
         (cause.getClass().equals(Exception.class) && emptyMessage))
     {
       StackTraceElement[] stackTrace = cause.getStackTrace();