mail[Wesnoth-commits] r29120 - in /branches/1.4: changelog players_changelog src/playmp_controller.cpp


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by paniemin on August 30, 2008 - 18:04:
Author: suokko
Date: Sat Aug 30 18:04:46 2008
New Revision: 29120

URL: http://svn.gna.org/viewcvs/wesnoth?rev=29120&view=rev
Log:
Backported: Fixed OOS bug when giving control and having move in undo stack.


Modified:
    branches/1.4/changelog
    branches/1.4/players_changelog
    branches/1.4/src/playmp_controller.cpp

Modified: branches/1.4/changelog
URL: 
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/changelog?rev=29120&r1=29119&r2=29120&view=diff
==============================================================================
--- branches/1.4/changelog (original)
+++ branches/1.4/changelog Sat Aug 30 18:04:46 2008
@@ -9,6 +9,8 @@
    * updated translations: Chinese (Traditional), Danish, French, Hungarian,
      Italian, Lithuanian, Russian, Spanish
    * fonts: DejaVuSans 2.26
+ * miscellaneous and bug fixes:
+   * Fixed OOS bug when giving control and having move in undo stack.
 
 Version 1.4.4:
  * language and i18n:

Modified: branches/1.4/players_changelog
URL: 
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/players_changelog?rev=29120&r1=29119&r2=29120&view=diff
==============================================================================
--- branches/1.4/players_changelog (original)
+++ branches/1.4/players_changelog Sat Aug 30 18:04:46 2008
@@ -13,7 +13,9 @@
  * language and i18n:
    * updated translations: Chinese (Traditional), Danish, French, Italian,
      Lithuanian, Russian, Spanish.
-
+ 
+ * Miscellaneous and bug fixes:
+   * Fixed OOS bug when giving control and having move in undo stack.
 Version 1.4.4:
  * language and i18n:
    * new translation: Latvian

Modified: branches/1.4/src/playmp_controller.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/src/playmp_controller.cpp?rev=29120&r1=29119&r2=29120&view=diff
==============================================================================
--- branches/1.4/src/playmp_controller.cpp (original)
+++ branches/1.4/src/playmp_controller.cpp Sat Aug 30 18:04:46 2008
@@ -22,6 +22,8 @@
 #include "playturn.hpp"
 #include "sound.hpp"
 #include "upload_log.hpp"
+
+#include "SDL.h"
 
 #include <cassert>
 
@@ -182,6 +184,9 @@
                                try{
                                        if 
(turn_data_->process_network_data(cfg,res,backlog,skip_replay_) == 
turn_info::PROCESS_RESTART_TURN)
                                        {
+                                               // Clean undo stack if turn 
has to be restarted (losing control)
+                                               while(!undo_stack_.empty())
+                                                       
menu_handler_.undo(gui_->get_playing_team() + 1);
                                                throw 
end_turn_exception(gui_->get_playing_team() + 1);
                                        }
                                }




Related Messages


Powered by MHonArc, Updated Sat Aug 30 18:41:24 2008