From 25d904dc3709e5a5856abc3af36190bb39424d89 Mon Sep 17 00:00:00 2001
From: Eric Lesiuta <elesiuta@gmail.com>
Date: Mon, 7 Dec 2020 16:19:28 -0500
Subject: [PATCH] gui: Fix blank device name under "Recent Changes" (#7185)

fixes the device showing up as blank if the friendly name is known
---
 gui/default/syncthing/core/syncthingController.js           | 2 +-
 gui/default/untrusted/syncthing/core/syncthingController.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gui/default/syncthing/core/syncthingController.js b/gui/default/syncthing/core/syncthingController.js
index 8abdf42b5..f3dd4b9af 100755
--- a/gui/default/syncthing/core/syncthingController.js
+++ b/gui/default/syncthing/core/syncthingController.js
@@ -1094,7 +1094,7 @@ angular.module('syncthing.core')
             if (matches.length !== 1) {
                 return shortID;
             }
-            return matches[0].name;
+            return $scope.friendlyNameFromID(matches[0]);
         };
 
         $scope.friendlyNameFromID = function (deviceID) {
diff --git a/gui/default/untrusted/syncthing/core/syncthingController.js b/gui/default/untrusted/syncthing/core/syncthingController.js
index 4f2a20e74..fd109be97 100755
--- a/gui/default/untrusted/syncthing/core/syncthingController.js
+++ b/gui/default/untrusted/syncthing/core/syncthingController.js
@@ -1098,7 +1098,7 @@ angular.module('syncthing.core')
             if (matches.length !== 1) {
                 return shortID;
             }
-            return matches[0].name;
+            return $scope.friendlyNameFromID(matches[0]);
         };
 
         $scope.friendlyNameFromID = function (deviceID) {