From 27aefddd82a4ea0dddabdefa672c5da6bd511f98 Mon Sep 17 00:00:00 2001
From: Stas Degteff <stas_degteff@users.sourceforge.net>
Date: Sun, 20 Jan 2008 15:22:59 +0000
Subject: [PATCH] Small code simplifying

---
 golded3/geline.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/golded3/geline.cpp b/golded3/geline.cpp
index 4aa78eb..3e0a56f 100644
--- a/golded3/geline.cpp
+++ b/golded3/geline.cpp
@@ -1839,7 +1839,9 @@ char* XlatStr(char* dest, const char* src, int level, Chs* chrtbl, int qpencoded
 
       case SOFTCR:
         translated = false;
-        if (CompTable and not WideDispsoftcr)
+        if (WideDispsoftcr)
+          goto defaultchardo;
+        else if (CompTable)
         {
           if(sptr > src) {
             if(not (isspace(*(sptr-1)) or isspace(*(sptr+1)))) {
@@ -1867,8 +1869,6 @@ char* XlatStr(char* dest, const char* src, int level, Chs* chrtbl, int qpencoded
             }
           }
         }
-        else if (WideDispsoftcr)
-          goto defaultchardo;
         if(not translated)
           *dptr++ = *sptr++;
         break;