From 2f38a32b0ab6ff0610ce4f296ec748f4cbbfa231 Mon Sep 17 00:00:00 2001
From: Mike Black W9MDB <mdblack98@yahoo.com>
Date: Thu, 10 Feb 2022 09:54:54 -0600
Subject: [PATCH] Move memcpy of deprecated structure in rotator.c and add
 memcpy to amplifier.c https://github.com/Hamlib/Hamlib/issues/960

---
 src/amplifier.c | 2 ++
 src/rotator.c   | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/amplifier.c b/src/amplifier.c
index e9ed4c3a8..6b522ed5c 100644
--- a/src/amplifier.c
+++ b/src/amplifier.c
@@ -416,6 +416,8 @@ int HAMLIB_API amp_open(AMP *amp)
         }
     }
 
+    memcpy(&amp->state.ampport_deprecated, &amp->state.ampport,
+           sizeof(amp->state.ampport_deprecated));
 
     return RIG_OK;
 }
diff --git a/src/rotator.c b/src/rotator.c
index 5e17bb730..edf624c72 100644
--- a/src/rotator.c
+++ b/src/rotator.c
@@ -470,9 +470,6 @@ int HAMLIB_API rot_open(ROT *rot)
         return -RIG_EINVAL;
     }
 
-    memcpy(&rot->state.rotport_deprecated, &rot->state.rotport,
-           sizeof(rot->state.rotport_deprecated));
-
     add_opened_rot(rot);
 
     rs->comm_state = 1;
@@ -491,6 +488,9 @@ int HAMLIB_API rot_open(ROT *rot)
         }
     }
 
+    memcpy(&rot->state.rotport_deprecated, &rot->state.rotport,
+           sizeof(rot->state.rotport_deprecated));
+
     return RIG_OK;
 }