Merge pull request #955 from StephenHodgson/HTK-local

StephenHodgson · web-flow · commit 3d3de65b50de · 2017-09-11T09:54:29.000-07:00
Fixed null reference when setting icon in icon generator with bad dimensions.
diff --git a/Assets/HoloToolkit/Utilities/Scripts/Editor/SetIconsWindow.cs b/Assets/HoloToolkit/Utilities/Scripts/Editor/SetIconsWindow.cs
@@ -129,10 +129,10 @@ private static Texture2D CreateImageInput(string imageTitle, int width, int heig
             if (newIcon.width != width && newIcon.height != height)
             {
                 // reset
-                newIcon = texture;
                 EditorUtility.DisplayDialog("Invalid Image",
                     string.Format("{0} should be an image with preferred size of {1}x{2}. Provided image was: {3}x{4}.", imageTitle, width, height, newIcon.width, newIcon.height),
                     "Ok");
+                newIcon = texture;
             }
             else
             {

Original file line number	Diff line number	Diff line change
`@@ -129,10 +129,10 @@ private static Texture2D CreateImageInput(string imageTitle, int width, int heig`
`129`	`129`	`if (newIcon.width != width && newIcon.height != height)`
`130`	`130`	`{`
`131`	`131`	`// reset`
`132`		`- newIcon = texture;`
`133`	`132`	`EditorUtility.DisplayDialog("Invalid Image",`
`134`	`133`	`string.Format("{0} should be an image with preferred size of {1}x{2}. Provided image was: {3}x{4}.", imageTitle, width, height, newIcon.width, newIcon.height),`
`135`	`134`	`"Ok");`
	`135`	`+ newIcon = texture;`
`136`	`136`	`}`
`137`	`137`	`else`
`138`	`138`	`{`