From kde-commits  Sun Oct 31 23:23:47 2010
From: Stefan Majewsky <majewsky () gmx ! net>
Date: Sun, 31 Oct 2010 23:23:47 +0000
To: kde-commits
Subject: KDE/kdegames/kolf
Message-Id: <20101031232347.D6029AC8AB () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=128856758012975

SVN commit 1191721 by majewsky:

Fix collision behavior of Cup, and fix a crash in KolfGame dtor.

The crash fix introduces another crash when the game is closed, but
fixing the other crash is more important right now because it hindered
me from starting any games.

 M  +3 -0      game.cpp  


--- trunk/KDE/kdegames/kolf/game.cpp #1191720:1191721
@@ -1083,6 +1083,7 @@
 	const int diameter = 16;
 	setSize(QSizeF(diameter, diameter));
 	addShape(new Kolf::EllipseShape(QRectF(-diameter / 2, -diameter / 2, diameter, diameter)));
+	setSimulationType(CanvasItem::CollisionSimulation);
 
 	setZValue(998.1);
 }
@@ -2156,6 +2157,8 @@
 
 KolfGame::~KolfGame()
 {
+	for (PlayerList::Iterator it = players->begin(); it != players->end(); ++it)
+		(*it).ball()->setGame(0);
 	delete cfg;
 #ifdef SOUND
 	delete m_player;