From b6006dacca072334a81dfed5c24d2283d66148b5 Mon Sep 17 00:00:00 2001
From: Bill Somerville <g4wjs@classdesign.com>
Date: Sun, 18 Dec 2016 22:20:07 +0000
Subject: [PATCH] Correctly extract grid from reply to tailender in MSK144
 contest exchange

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7399 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 decodedtext.cpp | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/decodedtext.cpp b/decodedtext.cpp
index 5525fbab7..fd4392e2b 100644
--- a/decodedtext.cpp
+++ b/decodedtext.cpp
@@ -134,11 +134,18 @@ void DecodedText::deCallAndGrid(/*out*/QString& call, QString& grid)
 {
   auto msg = _string;
   msg = msg.replace (QRegularExpression {" CQ ([A-Z]{2,2}|[0-9]{3,3}) "}, " CQ_\\1 ").mid (column_qsoText);
-  int i1 = msg.indexOf(" ");
-  call = msg.mid(i1+1);
-  int i2 = call.indexOf(" ");
-  grid = call.mid(i2+1,4);
-  call = call.mid(0,i2).replace(">","");
+  int i1 = msg.indexOf (" ");
+  call = msg.mid (i1 + 1);
+  int i2 = call.indexOf (" ");
+  if (" R " == call.mid (i2, 3)) // MSK144 contest mode report
+    {
+      grid = call.mid (i2 + 3, 4);
+    }
+  else
+    {
+      grid = call.mid (i2 + 1, 4);
+    }
+  call = call.left (i2).replace (">", "");
 }
 
 int DecodedText::timeInSeconds()