rpms/kdegames/devel kdegames-4.2.2-ksirk-rh#486380.patch, 1.1, 1.2 kdegames.spec, 1.125, 1.126

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9106/devel

Modified Files:
	kdegames-4.2.2-ksirk-rh#486380.patch kdegames.spec 
Log Message:
Another attempt at fixing the KsirK crash.

kdegames-4.2.2-ksirk-rh#486380.patch:

Index: kdegames-4.2.2-ksirk-rh#486380.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames-4.2.2-ksirk-rh#486380.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdegames-4.2.2-ksirk-rh#486380.patch	8 Apr 2009 18:42:04 -0000	1.1
+++ kdegames-4.2.2-ksirk-rh#486380.patch	8 Apr 2009 22:45:28 -0000	1.2
@@ -1,12 +1,50 @@
-diff -ur kdegames-4.2.2/ksirk/ksirk/GameLogic/gameautomaton.cpp kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/GameLogic/gameautomaton.cpp
---- kdegames-4.2.2/ksirk/ksirk/GameLogic/gameautomaton.cpp	2009-02-26 15:27:37.000000000 +0100
-+++ kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/GameLogic/gameautomaton.cpp	2009-04-08 20:37:33.000000000 +0200
-@@ -2676,6 +2676,8 @@
- void GameAutomaton::removeAllPlayers()
+diff -ur kdegames-4.2.2/ksirk/ksirk/kgamewin.cpp kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/kgamewin.cpp
+--- kdegames-4.2.2/ksirk/ksirk/kgamewin.cpp	2009-02-26 15:27:43.000000000 +0100
++++ kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/kgamewin.cpp	2009-04-09 00:41:24.000000000 +0200
+@@ -132,6 +132,7 @@
+   m_downarrow(0),
+   m_leftarrow(0),
+   m_rightarrow(0),
++  m_reinitializingGame(false),
+   m_newGameDialog(0),
+   m_stateBeforeNewGame(GameAutomaton::INVALID),
+   m_stackWidgetBeforeNewGame(-1),
+diff -ur kdegames-4.2.2/ksirk/ksirk/kgamewin.h kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/kgamewin.h
+--- kdegames-4.2.2/ksirk/ksirk/kgamewin.h	2009-02-26 15:27:43.000000000 +0100
++++ kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/kgamewin.h	2009-04-09 00:39:57.000000000 +0200
+@@ -1113,6 +1113,7 @@
+   bool m_networkGame;
+   int m_port;
+   uint m_newPlayersNumber;
++  bool m_reinitializingGame;
+ 
+   NewGameDialogImpl* m_newGameDialog;
+ 
+diff -ur kdegames-4.2.2/ksirk/ksirk/kgamewinslots.cpp kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/kgamewinslots.cpp
+--- kdegames-4.2.2/ksirk/ksirk/kgamewinslots.cpp	2009-02-26 15:27:43.000000000 +0100
++++ kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/kgamewinslots.cpp	2009-04-09 00:42:57.000000000 +0200
+@@ -75,7 +75,7 @@
+   QPointF mousePosition;
+   Country *mouseLocalisation;
+ 
+-  if (m_frame == 0)
++  if (m_frame == 0 || m_reinitializingGame)
+   {
+     return;
+   }
+@@ -952,6 +952,7 @@
  {
-   kDebug();
-+  // reset all countries or they will refer to nonexistent players => crash
-+  m_game->theWorld()->reset();
-   m_currentPlayer = "";
-   foreach (KPlayer*p, *playerList())
+   kDebug() << nbPlayers << skin << nbNetworkPlayers << useGoals;
+   m_automaton->setGameStatus(KGame::End);
++  m_reinitializingGame = true;
+   m_automaton->removeAllPlayers();
+ 
+   showMap();
+@@ -961,6 +962,7 @@
+   m_automaton->savedState(GameLogic::GameAutomaton::INVALID);
+   m_automaton->setNetworkPlayersNumber(m_automaton->networkGameType()==GameAutomaton::None?0:nbNetworkPlayers);
+   m_automaton->finishSetupPlayersNumberAndSkin(skin, m_automaton->networkGameType(), nbPlayers);
++  m_reinitializingGame = false;
+ 
+   if (m_automaton->networkGameType()==GameAutomaton::Jabber && m_jabberClient && m_jabberClient->isConnected())
    {


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- kdegames.spec	8 Apr 2009 18:42:04 -0000	1.125
+++ kdegames.spec	8 Apr 2009 22:45:28 -0000	1.126
@@ -3,7 +3,7 @@
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
 Version: 4.2.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -199,7 +199,7 @@
 
 
 %changelog
-* Wed Apr 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-5
+* Wed Apr 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-6
 - fix KsirK crash when starting a 2nd local game with Qt 4.5 (#486380)
 
 * Sat Apr 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-4