diff --git a/mythtv/programs/mythfrontend/proglist.cpp b/mythtv/programs/mythfrontend/proglist.cpp
index ff6d519ba2..a6b74e6c21 100644
a
|
b
|
class plTitleSort : public plCompare |
1058 | 1058 | bool operator()(const ProgramInfo *a, const ProgramInfo *b) override // plCompare |
1059 | 1059 | { |
1060 | 1060 | if (a->GetSortTitle() != b->GetSortTitle()) |
1061 | | return naturalCompare(a->GetSortTitle(), b->GetSortTitle()); |
| 1061 | return naturalCompare(a->GetSortTitle(), b->GetSortTitle()) < 0; |
1062 | 1062 | if (a->GetSortSubtitle() != b->GetSortSubtitle()) |
1063 | | return naturalCompare(a->GetSortSubtitle(), b->GetSortSubtitle()); |
| 1063 | return naturalCompare(a->GetSortSubtitle(), b->GetSortSubtitle()) < 0; |
1064 | 1064 | |
1065 | 1065 | if (a->GetRecordingStatus() == b->GetRecordingStatus()) |
1066 | 1066 | return a->GetScheduledStartTime() < b->GetScheduledStartTime(); |
… |
… |
class plPrevTitleSort : public plCompare |
1093 | 1093 | bool operator()(const ProgramInfo *a, const ProgramInfo *b) override // plCompare |
1094 | 1094 | { |
1095 | 1095 | if (a->GetSortTitle() != b->GetSortTitle()) |
1096 | | return naturalCompare(a->GetSortTitle(), b->GetSortTitle()); |
| 1096 | return naturalCompare(a->GetSortTitle(), b->GetSortTitle()) < 0; |
1097 | 1097 | if (a->GetSortSubtitle() != b->GetSortSubtitle()) |
1098 | | return naturalCompare(a->GetSortSubtitle(), b->GetSortSubtitle()); |
| 1098 | return naturalCompare(a->GetSortSubtitle(), b->GetSortSubtitle()) < 0; |
1099 | 1099 | |
1100 | 1100 | if (a->GetProgramID() != b->GetProgramID()) |
1101 | 1101 | return a->GetProgramID() < b->GetProgramID(); |
diff --git a/mythtv/programs/mythfrontend/programrecpriority.cpp b/mythtv/programs/mythfrontend/programrecpriority.cpp
index b25fb14106..57336dd123 100644
a
|
b
|
class TitleSort |
125 | 125 | if (a->GetSortTitle() != b->GetSortTitle()) |
126 | 126 | { |
127 | 127 | if (m_reverse) |
128 | | return naturalCompare(b->GetSortTitle(), a->GetSortTitle()); |
| 128 | return naturalCompare(b->GetSortTitle(), a->GetSortTitle()) < 0; |
129 | 129 | else |
130 | | return naturalCompare(a->GetSortTitle(), b->GetSortTitle()); |
| 130 | return naturalCompare(a->GetSortTitle(), b->GetSortTitle()) < 0; |
131 | 131 | } |
132 | 132 | |
133 | 133 | if (a->GetSortSubtitle() != b->GetSortSubtitle()) |
134 | 134 | { |
135 | 135 | if (m_reverse) |
136 | | return naturalCompare(b->GetSortSubtitle(), a->GetSortSubtitle()); |
| 136 | return naturalCompare(b->GetSortSubtitle(), a->GetSortSubtitle()) < 0; |
137 | 137 | else |
138 | | return naturalCompare(a->GetSortSubtitle(), b->GetSortSubtitle()); |
| 138 | return naturalCompare(a->GetSortSubtitle(), b->GetSortSubtitle()) < 0; |
139 | 139 | } |
140 | 140 | |
141 | 141 | int finalA = a->GetRecordingPriority(); |
… |
… |
class ProgramCountSort |
288 | 288 | if (m_reverse) |
289 | 289 | { |
290 | 290 | if (a->GetSortTitle() != b->GetSortTitle()) |
291 | | return naturalCompare(b->GetSortTitle(), a->GetSortTitle()); |
292 | | return naturalCompare(b->GetSortSubtitle(), a->GetSortSubtitle()); |
| 291 | return naturalCompare(b->GetSortTitle(), a->GetSortTitle()) < 0; |
| 292 | return naturalCompare(b->GetSortSubtitle(), a->GetSortSubtitle()) < 0; |
293 | 293 | } |
294 | 294 | else |
295 | 295 | { |
296 | 296 | if (a->GetSortTitle() != b->GetSortTitle()) |
297 | | return naturalCompare(a->GetSortTitle(), b->GetSortTitle()); |
298 | | return naturalCompare(a->GetSortSubtitle(), b->GetSortSubtitle()); |
| 297 | return naturalCompare(a->GetSortTitle(), b->GetSortTitle()) < 0; |
| 298 | return naturalCompare(a->GetSortSubtitle(), b->GetSortSubtitle()) < 0; |
299 | 299 | } |
300 | 300 | } |
301 | 301 | |
… |
… |
class ProgramRecCountSort |
335 | 335 | if (m_reverse) |
336 | 336 | { |
337 | 337 | if (a->GetSortTitle() != b->GetSortTitle()) |
338 | | return naturalCompare(b->GetSortTitle(), a->GetSortTitle()); |
339 | | return naturalCompare(b->GetSortSubtitle(), a->GetSortSubtitle()); |
| 338 | return naturalCompare(b->GetSortTitle(), a->GetSortTitle()) < 0; |
| 339 | return naturalCompare(b->GetSortSubtitle(), a->GetSortSubtitle()) < 0; |
340 | 340 | } |
341 | 341 | else |
342 | 342 | { |
343 | 343 | if (a->GetSortTitle() != b->GetSortTitle()) |
344 | | return naturalCompare(a->GetSortTitle(), b->GetSortTitle()); |
345 | | return naturalCompare(a->GetSortSubtitle(), b->GetSortSubtitle()); |
| 344 | return naturalCompare(a->GetSortTitle(), b->GetSortTitle()) < 0; |
| 345 | return naturalCompare(a->GetSortSubtitle(), b->GetSortSubtitle()) < 0; |
346 | 346 | } |
347 | 347 | } |
348 | 348 | |
… |
… |
class ProgramLastRecordSort |
372 | 372 | if (m_reverse) |
373 | 373 | { |
374 | 374 | if (a->GetSortTitle() != b->GetSortTitle()) |
375 | | return naturalCompare(b->GetSortTitle(), a->GetSortTitle()); |
376 | | return naturalCompare(b->GetSortSubtitle(), a->GetSortSubtitle()); |
| 375 | return naturalCompare(b->GetSortTitle(), a->GetSortTitle()) < 0; |
| 376 | return naturalCompare(b->GetSortSubtitle(), a->GetSortSubtitle()) < 0; |
377 | 377 | } |
378 | 378 | else |
379 | 379 | { |
380 | 380 | if (a->GetSortTitle() != b->GetSortTitle()) |
381 | | return naturalCompare(a->GetSortTitle(), b->GetSortTitle()); |
382 | | return naturalCompare(a->GetSortSubtitle(), b->GetSortSubtitle()); |
| 381 | return naturalCompare(a->GetSortTitle(), b->GetSortTitle()) < 0; |
| 382 | return naturalCompare(a->GetSortSubtitle(), b->GetSortSubtitle()) < 0; |
383 | 383 | } |
384 | 384 | } |
385 | 385 | |
… |
… |
class ProgramAvgDelaySort |
409 | 409 | if (m_reverse) |
410 | 410 | { |
411 | 411 | if (a->GetSortTitle() != b->GetSortTitle()) |
412 | | return naturalCompare(b->GetSortTitle(), a->GetSortTitle()); |
413 | | return naturalCompare(b->GetSortSubtitle(), a->GetSortSubtitle()); |
| 412 | return naturalCompare(b->GetSortTitle(), a->GetSortTitle()) < 0; |
| 413 | return naturalCompare(b->GetSortSubtitle(), a->GetSortSubtitle()) < 0; |
414 | 414 | } |
415 | 415 | else |
416 | 416 | { |
417 | 417 | if (a->GetSortTitle() != b->GetSortTitle()) |
418 | | return naturalCompare(a->GetSortTitle(), b->GetSortTitle()); |
419 | | return naturalCompare(a->GetSortSubtitle(), b->GetSortSubtitle()); |
| 418 | return naturalCompare(a->GetSortTitle(), b->GetSortTitle()) < 0; |
| 419 | return naturalCompare(a->GetSortSubtitle(), b->GetSortSubtitle()) < 0; |
420 | 420 | } |
421 | 421 | } |
422 | 422 | |