Merge pull request #8095 from Memphiz/fix_inertialscrolling

xbmc · Sep 19, 2015 · 9f3e337 · 9f3e337
2 parents 09d46e8 + 69de995
commit 9f3e337
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/xbmc/input/InertialScrollingHandler.cpp b/xbmc/input/InertialScrollingHandler.cpp
@@ -93,8 +93,16 @@ bool CInertialScrollingHandler::CheckForInertialScrolling(const CAction* action)
       //ask if the control wants inertial scrolling
       if(g_windowManager.SendMessage(message))
       {
-        if( message.GetParam1() == EVENT_RESULT_PAN_HORIZONTAL ||
-            message.GetParam1() == EVENT_RESULT_PAN_VERTICAL)
+        int result = 0;
+        if (message.GetPointer())
+        {
+          int *p = static_cast<int*>(message.GetPointer());
+          message.SetPointer(nullptr);
+          result = *p;
+          delete p;
+        }
+        if( result == EVENT_RESULT_PAN_HORIZONTAL ||
+            result == EVENT_RESULT_PAN_VERTICAL)
         {
           inertialRequested = true;
         }