Merge branch 'unstable' into trackhat-ui

* unstable:
  move header to right place
  shortcuts: whole is _WIN32, don't check twice nested
  qfc: move division last

1 files changed, 1 insertions, 1 deletions

diff --git a/qfunctionconfigurator/functionconfig.cpp b/qfunctionconfigurator/functionconfig.cpp
index b597a902..c97aec16 100644..100755
--- a/qfunctionconfigurator/functionconfig.cpp
+++ b/qfunctionconfigurator/functionconfig.cpp
@@ -136,7 +136,7 @@ void Map::reload() {
 
                 const n y_ = std::min<n>(max_y, std::max<n>(y, 0));
 
-                data[x] = y_ / max_y * integral_max;
+                data[x] = y_ * integral_max / max_y;
             }
         }