Eac one the files in this commit had an instance where a code path is

never traversed because of conditionals operating on values that
never change.

1 files changed, 1 insertions, 1 deletions

diff --git a/noncore/games/solitaire/canvascard.cpp b/noncore/games/solitaire/canvascard.cpp
index cd298ef..3ed9ea0 100644
--- a/noncore/games/solitaire/canvascard.cpp
+++ b/noncore/games/solitaire/canvascard.cpp
@@ -211,13 +211,13 @@ void CanvasCard::draw(QPainter &painter)
     } else {
         
         p->drawPixmap( ix, iy, *cardsBacks );
 
     }
 
-    if (p != &painter)
+    if (p != &painter && unscaledCard)
     {
         p->end();
         QPixmap *scaledCard = CreateScaledPixmap( unscaledCard, scaleX, scaleY );
         int xoff = scaledCard->width() / 2;
         int yoff = scaledCard->height() / 2;
         painter.drawPixmap( (int)x() + xOff - xoff, (int)y() + yOff - yoff, *scaledCard );