From 269a65862f48d5c289d749098c8c4184d36058ff Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Fri, 24 Jul 2020 16:20:49 +0200 Subject: [PATCH] crash fixed in geom-exp menu --- geom-exp.cpp | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/geom-exp.cpp b/geom-exp.cpp index a544ddf2..37937559 100644 --- a/geom-exp.cpp +++ b/geom-exp.cpp @@ -622,25 +622,27 @@ EX void showEuclideanMenu() { int denom = (2*ts + 2*tv - ts * tv); #if CAP_GP - ld area = PIU(cgi.gpdata->area); + if(GOLDBERG || INVERSE) { + ld area = PIU(cgi.gpdata->area); - if(GOLDBERG || WARPED) { - nom = 2 * (2*tv + (S3-2) * ts * (area-1)); - } - else if(UNRECTIFIED) { - if((gp::param.first + gp::param.second) % 2 == 0) - nom = ts * 2 * area; - else - nom = (2*tv + (S3-2) * ts * (area-1)); - } - else if(UNTRUNCATED) { - if((gp::param.first - gp::param.second) % 3 == 0) { - nom = ts * 4 * area; - denom *= 3; - } - else { + if(GOLDBERG || WARPED) { nom = 2 * (2*tv + (S3-2) * ts * (area-1)); - denom *= 3; + } + else if(UNRECTIFIED) { + if((gp::param.first + gp::param.second) % 2 == 0) + nom = ts * 2 * area; + else + nom = (2*tv + (S3-2) * ts * (area-1)); + } + else if(UNTRUNCATED) { + if((gp::param.first - gp::param.second) % 3 == 0) { + nom = ts * 4 * area; + denom *= 3; + } + else { + nom = 2 * (2*tv + (S3-2) * ts * (area-1)); + denom *= 3; + } } } #endif