Handle merge conflicts with jenny work

1 files changed, 2 insertions, 2 deletions

diff --git a/src/client/views/PropertiesButtons.tsx b/src/client/views/PropertiesButtons.tsx
index dd6448654..24857d8ee 100644
--- a/src/client/views/PropertiesButtons.tsx
+++ b/src/client/views/PropertiesButtons.tsx
@@ -102,9 +102,9 @@ export class PropertiesButtons extends React.Component<{}, {}> {
             else {
                 document.body.focus(); // so that we can access the clipboard without an error
                 setTimeout(() =>
-                    pasteImageBitmap((data: any, error: any) => {
+                    pasteImageBitmap((data_url: any, error: any) => {
                         error && console.log(error);
-                        data && VideoBox.convertDataUri(data, doc[Id] + "-thumb-frozen", true).then(
+                        data_url && VideoBox.convertDataUri(data_url, doc[Id] + "-thumb-frozen", true).then(
                             returnedfilename => doc["thumb-frozen"] = new ImageField(returnedfilename));
                     }));
             }