| 
					
				 | 
			
			
				@@ -292,38 +292,41 @@ public partial class DataEntryList : UserControl, ICorePanel, IDockPanel 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         Task.Run(() => 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            try 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            Dispatcher.Invoke(() => 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                var result = DocumentUtils.HandleFileDrop(e); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                if (result is not null) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                Progress.Show("Uploading documents"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                try 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    foreach (var (filename, stream) in result) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    var result = DocumentUtils.HandleFileDrop(e); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    if (result is not null) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        var newFilename = filename; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        byte[] data; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        if (stream is null) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                            data = File.ReadAllBytes(newFilename); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        else 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        foreach (var (filename, stream) in result) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                            using var memStream = new MemoryStream(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                            stream.CopyTo(memStream); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                            data = memStream.ToArray(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            var newFilename = filename; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            byte[] data; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            if (stream is null) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                data = File.ReadAllBytes(newFilename); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            else 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                using var memStream = new MemoryStream(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                stream.CopyTo(memStream); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                data = memStream.ToArray(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            data = RenderData(ref newFilename, data); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            _dataEntryGrid.UploadDocument(newFilename, data, Guid.Empty); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        data = RenderData(ref newFilename, data); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        _dataEntryGrid.UploadDocument(newFilename, data, Guid.Empty); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    Progress.Close(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            catch(Exception e) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                Dispatcher.BeginInvoke(() => 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                catch (Exception e) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    Progress.Close(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     MessageWindow.ShowError("Could not upload documents.", e); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 |