Don't change license if user clicks cancel (#1276)

SIL.Windows.Forms/ImageToolbox/ImageToolboxControl.cs

@@ -352,7 +352,7 @@ public void Closing()
 		/// <summary>
 		/// If set, this action will be used instead of the default (launching <see cref="MetadataEditorDialog"/>).
 		/// For example, the client may want to use a different UI to edit the `Metadata`.
-		/// The `Action<Metadata>` callback saves the modified `Metadata` to the image.
+		/// The `Action&lt;Metadata&gt;` callback saves the modified `Metadata` to the image.
 		/// <see cref="SetNewImageMetadata(Metadata)"/>
 		/// </summary>
 		public Action<Metadata, Action<Metadata>> EditMetadataActionOverride { get; set; }
@@ -366,21 +366,31 @@ private void OnEditMetadataLink_LinkClicked(object sender, LinkLabelLinkClickedE
 			//it's not clear at the moment where the following belongs... but we want
 			//to encourage Creative Commons Licensing, so if there is no license, we'll start
 			//the following dialog out with a reasonable default.
-			_imageInfo.Metadata.SetupReasonableLicenseDefaultBeforeEditing();
+			var isSuggesting = false;
+			var hadChanges = false;
+			if (_imageInfo.Metadata.IsLicenseNotSet)
+			{
+				isSuggesting = true;
+				hadChanges = _imageInfo.Metadata.HasChanges;
+				_imageInfo.Metadata.SetupReasonableLicenseDefaultBeforeEditing();
+			}
 
 			if (EditMetadataActionOverride != null)
 			{
 				EditMetadataActionOverride(_imageInfo.Metadata, SetNewImageMetadata);
 				return;
 			}
 
-			using(var dlg = new MetadataEditorDialog(_imageInfo.Metadata))
+			using var dlg = new MetadataEditorDialog(_imageInfo.Metadata);
+			if (DialogResult.OK == dlg.ShowDialog())
 			{
-				if(DialogResult.OK == dlg.ShowDialog())
-				{
-					Guard.AgainstNull(dlg.Metadata, " dlg.Metadata");
-					SetNewImageMetadata(dlg.Metadata);
-				}
+				Guard.AgainstNull(dlg.Metadata, " dlg.Metadata");
+				SetNewImageMetadata(dlg.Metadata);
+			}
+			else if (isSuggesting)
+			{
+				_imageInfo.Metadata.License = new NullLicense();
+				_imageInfo.Metadata.HasChanges = hadChanges;
 			}
 		}
 

SIL.Windows.Forms/ImageToolbox/PalasoImage.cs

@@ -308,7 +308,6 @@ private static Image LoadImageWithoutLocking(string path, out string tempPath)
 			{
 				var leakMe = TempFile.WithExtension(GetCorrectImageExtension(path));
 				RobustFile.Copy(path, leakMe.Path, true);
-
 				//we output the tempPath so that the caller can clean it up later
 				tempPath = leakMe.Path;
 
@@ -327,8 +326,9 @@ private static Image LoadImageWithoutLocking(string path, out string tempPath)
 					// assume it's a better indication of the problem.
 					var metadata = Metadata.FromFile(path);
 					if (metadata.IsOutOfMemoryPlausible(e))
+						// ReSharper disable once PossibleIntendedRethrow
 						throw e; // Deliberately NOT just "throw", that loses the extra information IsOutOfMemoryPlausible added to the exception.
-					throw new TagLib.CorruptFileException("File could not be read and is possible corrupted");
+					throw new TagLib.CorruptFileException("File could not be read and is possible corrupted", e);
 				}
 			}
 		}