Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / android / src / net / sf / openrocket / android / db / MotorDao.java

diff --git a/android/src/net/sf/openrocket/android/db/MotorDao.java b/android/src/net/sf/openrocket/android/db/MotorDao.java
index 81e9912dbe770e21b32e55bd8019ee2135b46c04..8c865437c8fd4d468918d486e4c95cfcd5dc21db 100644 (file)
--- a/android/src/net/sf/openrocket/android/db/MotorDao.java
+++ b/android/src/net/sf/openrocket/android/db/MotorDao.java
@@ -143,7 +143,7 @@ public class MotorDao {
                                /* selection args*/new String[] { groupVal },\r
                                /* groupby */null,\r
                                /* having*/null,\r
-                               /* orderby*/DESIGNATION);\r
+                               /* orderby*/TOTAL_IMPULSE);\r
                \r
        }\r
        \r
@@ -161,7 +161,7 @@ public class MotorDao {
                                /* selection args*/null,\r
                                /* groupby */null,\r
                                /* having*/null,\r
-                               /* orderby*/null,\r
+                               /* orderby*/groupCol,\r
                                /* limit*/null);\r
                \r
        }\r