bugfix: don't try to retain NULL

koekeishiya · Jun 8, 2020 · 4cbe37d · 4cbe37d
1 parent e538bcb
commit 4cbe37d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/display_manager.c b/src/display_manager.c
@@ -117,19 +117,19 @@ CFStringRef display_manager_arrangement_display_uuid(int arrangement)
     int index = arrangement - 1;
     if (in_range_ie(index, 0, count)) {
         if (g_display_manager.sort_order == DISPLAY_SORT_NONE) {
-            result = CFArrayGetValueAtIndex(displays, index);
+            result = CFRetain(CFArrayGetValueAtIndex(displays, index));
         } else {
             // copy the array to a mutable one, then sort it in place
             CFRange all = CFRangeMake((long) 0, (long) count);
             CFMutableArrayRef mut_displays = CFArrayCreateMutableCopy(NULL, count, displays);
             CFArraySortValues(mut_displays, all, &coordinate_comparator, NULL);
-            result = CFArrayGetValueAtIndex(mut_displays, index);
+            result = CFRetain(CFArrayGetValueAtIndex(mut_displays, index));
             CFRelease(mut_displays);
         }
     }
 
     CFRelease(displays);
-    return CFRetain(result);
+    return result;
 }
 
 uint32_t display_manager_arrangement_display_id(int arrangement)