2 files changed, 2 insertions, 9 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
@@ -205,25 +205,25 @@ void CanvasCard::draw(QPainter &painter)
 	    p->drawPixmap( ix +      4, iy +     4, *cardsChars, 7*(getValue()-1), 0, 7, 7 );
 	    p->drawPixmap( ix +     12, iy +     4, *cardsSuits, 7*(getSuit()-1), 0, 7, 8 );
 	    p->drawPixmap( ix +  w-4-7, iy + h-4-7, *cardsCharsUpsideDown, 7*(12-getValue()+1), 0, 7, 7 );
 	    p->drawPixmap( ix + w-12-7, iy + h-5-7, *cardsSuitsUpsideDown, 7*(3-getSuit()+1), 0, 7, 8 );
 	}
 
     } 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 );
 	delete p;
 	delete unscaledCard;
 	delete scaledCard;
     }
 }
 
diff --git a/noncore/games/tetrix/ohighscoredlg.cpp b/noncore/games/tetrix/ohighscoredlg.cpp
index 66f4917..504385f 100644
--- a/noncore/games/tetrix/ohighscoredlg.cpp
+++ b/noncore/games/tetrix/ohighscoredlg.cpp
@@ -165,40 +165,33 @@ OHighscoreDialog::OHighscoreDialog(OHighscore *highscore, QWidget *parent, const
 
 	createHighscoreListView();
 	
 	vbox_layout->addWidget( list );
 	QPEApplication::showDialog( this );
 }
 
 void OHighscoreDialog::createHighscoreListView()
 {
 	int pos = 10;
 	int points_ = 0;
 	int level_ = 0;
-	QListViewItem * Prev = 0;
 
         for ( t_playerData * Run = hs_->playerData.first(); 
               Run != 0; 
               Run=hs_->playerData.next() )
         {
                 QListViewItem *item;
 
-		if( Prev ) {
-                  // after previous
-                  item = new QListViewItem( list, Prev );
-                  Prev = item;
-                } else {
-                  item = new QListViewItem( list );
+                item = new QListViewItem( list );
 
-                }
 		item->setText(  0 , QString::number( pos ) );                   //number
 		item->setText(  1 , Run->sName );                       //name
 		if ( Run->points  == -1 )
 			points_ = 0;
 		else points_ =  Run->points;
 		if ( Run->level  == -1 )
                     level_ = 0;
 		else level_ =  Run->level;
 		item->setText(  2 , QString::number( points_ ) );   //points
 		item->setText(  3 , QString::number( level_ ) );    //level
 		pos--;
 	}