[Freeciv-Dev] (PR#10847) civserver: plrhand.c:859: finish_revolution: Assertion `0' failed.

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=10847 >

> [edearl@xxxxxxxxxxx - Thu Nov 04 02:38:14 2004]:

> Started a revolution. Later, a message said the revolution was over, but 
> no dialog box to ask which government.
> Tried to start a revolution again, and the client aborted.

Excellent bug report.  This patch will fix it.

It'll be fixed in the next beta.  Until then: don't do that.

jason

Index: server/plrhand.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/plrhand.c,v
retrieving revision 1.335
diff -u -r1.335 plrhand.c
--- server/plrhand.c    4 Nov 2004 03:02:11 -0000       1.335
+++ server/plrhand.c    4 Nov 2004 06:08:18 -0000
@@ -963,7 +963,8 @@
   if (pplayer->government == game.government_when_anarchy) {
     /* Already having a revolution. */
     assert(pplayer->revolution_finishes >= 0);
-    if (pplayer->revolution_finishes <= game.turn) {
+    if (pplayer->revolution_finishes <= game.turn
+       && government != game.government_when_anarchy) {
       /* The revolution was already over.  Now we should enter the new
        * government immediately. */
       finish_revolution(pplayer);