Update upstream source from tag 'upstream/5.1.0'

Update to upstream version '5.1.0'
with Debian dir 93ca74b8b4602fce4c9c7740e0cfdde25f086673

1 files changed, 15 insertions, 10 deletions

diff --git a/app/bin/ccontrol.c b/app/bin/ccontrol.c
index 9428e1a..8ff0396 100644
--- a/app/bin/ccontrol.c
+++ b/app/bin/ccontrol.c
@@ -47,10 +47,18 @@
 static const char rcsid[] = "@(#) : $Id$";
 
 #include <ctype.h>
-#include "track.h"
-#include "trackx.h"
+#include <string.h>
+
 #include "compound.h"
+#include "cundo.h"
+#include "custom.h"
+#include "fileio.h"
 #include "i18n.h"
+#include "layout.h"
+#include "param.h"
+#include "track.h"
+#include "trackx.h"
+#include "utility.h"
 
 EXPORT TRKTYP_T T_CONTROL = -1;
 
@@ -476,21 +484,18 @@ static STATUS_T CmdControl ( wAction_t action, coOrd pos )
         InfoMessage(_("Place control"));
         return C_CONTINUE;
     case C_DOWN:
-        SnapPos(&pos);
-        DDrawControl( &tempD, pos, GetScaleRatio(curScaleInx), wDrawColorBlack );
-        return C_CONTINUE;
-    case C_MOVE:
-        SnapPos(&pos);
-        DDrawControl( &tempD, pos, GetScaleRatio(curScaleInx), wDrawColorBlack );
+	case C_MOVE:
+		SnapPos(&pos);
+        DDrawControl( &tempD, pos, GetScaleRatio(GetLayoutCurScale()), wDrawColorBlack );
         return C_CONTINUE;
     case C_UP:
         SnapPos(&pos);
-        DDrawControl( &tempD, pos, GetScaleRatio(curScaleInx), wDrawColorBlack );
+        DDrawControl( &tempD, pos, GetScaleRatio(GetLayoutCurScale()), wDrawColorBlack );
         CreateNewControl(pos);
         return C_TERMINATE;
     case C_REDRAW:
     case C_CANCEL:
-        DDrawControl( &tempD, pos, GetScaleRatio(curScaleInx), wDrawColorBlack );
+        DDrawControl( &tempD, pos, GetScaleRatio(GetLayoutCurScale()), wDrawColorBlack );
         return C_CONTINUE;
     default:
         return C_CONTINUE;