lib/model: Pass correct file info to deleteItemOnDisk (fixes #5616 ) (#5617 )

gui: Add missing quote char
2019-03-25 12:43:21 +01:00 · 2019-03-25 12:37:10 +01:00
2 changed files with 2 additions and 2 deletions
@@ -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>
@@ -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
Author	SHA1	Message	Date
Simon FreiandJakob Borg	e4ab9d3312	lib/model: Pass correct file info to deleteItemOnDisk (fixes #5616 ) (#5617 )	2019-03-25 12:43:21 +01:00
Jakob Borg	24f41e169a	gui: Add missing quote char	2019-03-25 12:37:10 +01:00