Merge pull request #125 from Solaris-Skunk-Werks/bugfix/print-mech-image

Stop ignoring "Choose TRO Pic" image in print preview
Solaris-Skunk-Werks · Mar 19, 2020 · 8273787 · 8273787
2 parents 4fef102 + f0fb222
commit 8273787
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/sswlib/src/main/java/Print/PrintMech.java b/sswlib/src/main/java/Print/PrintMech.java
@@ -273,7 +273,8 @@ private void DrawSheet( Graphics2D graphics ) {
         start.x -= 3;
         start.y -= 6;
         if ( printMech ) {
-            MechImage = imageTracker.media.GetImage(imageTracker.media.DetermineMatchingImage(CurMech.GetName(), CurMech.GetModel(), CurMech.GetSSWImage()));
+            if (MechImage == null) // fallback to fluff image if user didn't explicitly choose a TRO pic in the print dialog
+                MechImage = imageTracker.media.GetImage(imageTracker.media.DetermineMatchingImage(CurMech.GetName(), CurMech.GetModel(), CurMech.GetSSWImage()));
             if( MechImage != null ) {
                 //graphics.drawRect(start.x, start.y, 150, 210);
                 Dimension d = imageTracker.media.reSize(getMechImage(), 150, 210);