From 6d92d27db71d870aa24178818ce72d5bada31a59 Mon Sep 17 00:00:00 2001
From: Nonoo <nonoo@nonoo.hu>
Date: Sat, 28 Nov 2020 11:44:44 +0100
Subject: [PATCH] Fix data mode not set through rigctld

---
 rigctld.go | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/rigctld.go b/rigctld.go
index 9cfb91a..e3061e6 100644
--- a/rigctld.go
+++ b/rigctld.go
@@ -169,12 +169,9 @@ func (s *rigctldStruct) processCmd(cmd string) (close bool, err error) {
 		err = s.send(mode, "\n", width, "\n")
 	case cmdSplit[0] == "M":
 		mode := cmdSplit[1]
+		var dataMode bool
 		if mode[:3] == "PKT" {
-			err = civControl.setDataMode(true)
-			if err != nil {
-				_ = s.sendReplyCode(rigctldInvalidParam)
-				return
-			}
+			dataMode = true
 			mode = mode[3:]
 		}
 		var modeCode byte
@@ -207,6 +204,11 @@ func (s *rigctldStruct) processCmd(cmd string) (close bool, err error) {
 		if err != nil {
 			_ = s.sendReplyCode(rigctldInvalidParam)
 		} else {
+			err = civControl.setDataMode(dataMode)
+			if err != nil {
+				_ = s.sendReplyCode(rigctldInvalidParam)
+				return
+			}
 			_ = s.sendReplyCode(rigctldNoError)
 		}
 	case cmd == "t":