fixed displayHold typo - should help resolve crashes

ELY3M · Aug 21, 2022 · 634088b · 634088b
1 parent a57f013
commit 634088b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/app/src/main/java/joshuatee/wx/radar/WXGLRender.kt b/app/src/main/java/joshuatee/wx/radar/WXGLRender.kt
@@ -437,12 +437,12 @@ class WXGLRender(private val context: Context, val paneNumber: Int) : Renderer {
         //
         // Draw Nexrad radar
         //
-	//elys mod
+	    //elys mod
         //show/hide radar
+        UtilityLog.d("radarshow", "displayHold: " + displayHold)
         UtilityLog.d("radarshow", "showRadarWhenPan: " + RadarPreferences.showRadarWhenPan)
         UtilityLog.d("radarshow", "showradar: " + RadarPreferences.showRadar)
-        if ((RadarPreferences.showRadar) || (displayHold && !RadarPreferences.showRadarWhenPan)) {
-        //if (displayHold && !RadarPreferences.showRadarWhenPan) {
+        if ((RadarPreferences.showRadar) && (!(displayHold && !RadarPreferences.showRadarWhenPan))) {
         //org
         //if (!(displayHold && !RadarPreferences.showRadarWhenPan)) {
             (0 until chunkCount).forEach {
@@ -475,7 +475,7 @@ class WXGLRender(private val context: Context, val paneNumber: Int) : Renderer {
 
 
             //elys mod - hailmod
-	    //Custom Hail Icons
+	        //Custom Hail Icons
             hiBuffersList.forEach {
                 if (zoom > zoomToHideMiscFeatures) {
                     drawHI(it)

diff --git a/app/src/main/java/joshuatee/wx/radar/WXGLSurfaceView.kt b/app/src/main/java/joshuatee/wx/radar/WXGLSurfaceView.kt
@@ -134,7 +134,7 @@ class WXGLSurfaceView : GLSurfaceView, GestureDetector.OnGestureListener, Gestur
             }
 	        //elys mod - 3 finger to show conus radar map
             MotionEvent.ACTION_MOVE -> {
-	        //elys mod
+	            //elys mod
                 //3 fingers press to show conus
                 val count = event.pointerCount
                 UtilityLog.d("wx", "Fingers Count: "+count)
@@ -149,7 +149,8 @@ class WXGLSurfaceView : GLSurfaceView, GestureDetector.OnGestureListener, Gestur
                 } else {
                     if (!locationFragment) {
                         (0 until numPanes).forEach {
-                            wxglRenders[it].displayHold = false
+                            wxglTextObjects[it].hideLabels()
+                            wxglRenders[it].displayHold = true
                             wxglRenders[it].displayConus = false
                         }
                     }