1 files changed, 3 insertions, 1 deletions

diff --git a/noncore/games/minesweep/minefield.cpp b/noncore/games/minesweep/minefield.cpp
index 72c05b0..1987ea5 100644
--- a/noncore/games/minesweep/minefield.cpp
+++ b/noncore/games/minesweep/minefield.cpp
@@ -695,49 +695,51 @@ void MineField::readConfig(Config& cfg)
     currRow = currCol = 0;
     QString grid = cfg.readEntry("Grid");
     int x;
     if ( !grid.isEmpty() ) {
 	int i=0;
 	minecount=0;
 	mineguess=0;
 	for ( x = 0; x < numCols; x++ ) {
 	    for ( int y = 0; y < numRows; y++ ) {
 		char code='A'+(x*17+y*101)%21; // Reduce the urge to cheat
 		int st = (char)(QChar)grid[i++]-code;
 		Mine* m = mine( y, x );
+		if (!m)
+		    continue;
 		if ( st >= 5 ) {
 		    st-=5;
 		    m->setMined(TRUE);
 		    minecount++;
 		    mineguess++;
 		}
 		m->setState((Mine::MineState)st);
 		switch ( m->state() ) {
 		  case Mine::Flagged:
 		    if (m->isMined())
 			minecount--;
 		    mineguess--;
 		    break;
 		  case Mine::Empty:
 		    --nonminecount;
 		    break;
 		default:
 		    break;
 		}
 	    }
 	}
 	for ( x = 0; x < numCols; x++ ) {
 	    for ( int y = 0; y < numRows; y++ ) {
 		Mine* m = mine( y, x );
-		if ( m->state() == Mine::Empty )
+		if ( m && m->state() == Mine::Empty )
 		    m->setHint(getHint(y,x));
 	    }
 	}
     }
     setState( Playing );
     emit mineCount( mineguess );
 }
 
 QSize MineField::sizeHint() const
 {
     if ( qApp->desktop()->width() >= 240 )
 	return QSize(200,200);