From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 9 Oct 2017 08:21:14 +0000 (+0200)
Subject: idnode: partially revert the previous code in idnode_cmp_sort()
X-Git-Tag: v4.2.4~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=32232133662c812fc9dc786cad84d2e0dae303c5;p=thirdparty%2Ftvheadend.git

idnode: partially revert the previous code in idnode_cmp_sort()
---

diff --git a/src/idnode.c b/src/idnode.c
index 1fb7e5d71..0077ea0ce 100644
--- a/src/idnode.c
+++ b/src/idnode.c
@@ -703,12 +703,12 @@ idnode_cmp_sort
   /* Get display string */
   if (p->islist || (p->list && !(p->opts & PO_SORTKEY))) {
     int r;
-    char *stra = idnode_get_display(ina, p, sort->lang) ?: "";
-    char *strb = idnode_get_display(inb, p, sort->lang) ?: "";
+    char *stra = idnode_get_display(ina, p, sort->lang);
+    char *strb = idnode_get_display(inb, p, sort->lang);
     if (sort->dir == IS_ASC)
-      r = strcmp(stra, strb);
+      r = strcmp(stra ?: "", strb ?: "");
     else
-      r = strcmp(strb, stra);
+      r = strcmp(strb ?: "", stra ?: "");
     free(stra);
     free(strb);
     return r;