From 24f41e169a2cb30978b81b198f7175941c873844 Mon Sep 17 00:00:00 2001
From: Jakob Borg <jakob@kastelo.net>
Date: Thu, 14 Mar 2019 07:37:18 +0100
Subject: [PATCH 1/2] gui: Add missing quote char

---
 gui/default/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gui/default/index.html b/gui/default/index.html
index bd0ae157..4ed33a95 100644
--- a/gui/default/index.html
+++ b/gui/default/index.html
@@ -709,7 +709,7 @@
                     <tr>
                       <th><span class="fas fa-fw fa-link"></span>&nbsp<span translate>Address</span></th>
                       <td ng-if="connections[deviceCfg.deviceID].connected" class="text-right">
-                        <span tooltip data-original-title="{{ connections[deviceCfg.deviceID].type.indexOf('Relay') > -1 ? '' : connections[deviceCfg.deviceID].type }} {{ connections[deviceCfg.deviceID].crypto }}>
+                        <span tooltip data-original-title="{{ connections[deviceCfg.deviceID].type.indexOf('Relay') > -1 ? '' : connections[deviceCfg.deviceID].type }} {{ connections[deviceCfg.deviceID].crypto }}">
                           {{deviceAddr(deviceCfg)}}
                         </span>
                       </td>

From e4ab9d3312dfd768e269f5a7ed75eb9cfe50bffb Mon Sep 17 00:00:00 2001
From: Simon Frei <freisim93@gmail.com>
Date: Mon, 25 Mar 2019 12:42:39 +0100
Subject: [PATCH 2/2] lib/model: Pass correct file info to deleteItemOnDisk
 (fixes #5616) (#5617)

---
 lib/model/folder_sendrecv.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/model/folder_sendrecv.go b/lib/model/folder_sendrecv.go
index 60c152d9..69669dfd 100644
--- a/lib/model/folder_sendrecv.go
+++ b/lib/model/folder_sendrecv.go
@@ -1521,7 +1521,7 @@ func (f *sendReceiveFolder) performFinish(file, curFile protocol.FileInfo, hasCu
 				return f.moveForConflict(name, file.ModifiedBy.String(), scanChan)
 			}, f.fs, curFile.Name)
 		} else {
-			err = f.deleteItemOnDisk(file, scanChan)
+			err = f.deleteItemOnDisk(curFile, scanChan)
 		}
 		if err != nil {
 			return err