From: <geo...@us...> - 2011-09-04 21:56:02
|
Revision: 4228 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=4228&view=rev Author: geoffthemedio Date: 2011-09-04 21:55:56 +0000 (Sun, 04 Sep 2011) Log Message: ----------- -Added blank link to top of ship_parts.txt which might or might not have fixed a weird bug where the troop pod was showing up in the encyclopedia as a detection class part. -Wrapped incomplete design resetting (happens during the ship design process) in a try-catch block to hopefully prevent a weird crash I saw once or twice but can't replicate. Modified Paths: -------------- trunk/FreeOrion/UI/DesignWnd.cpp trunk/FreeOrion/default/ship_parts.txt Modified: trunk/FreeOrion/UI/DesignWnd.cpp =================================================================== --- trunk/FreeOrion/UI/DesignWnd.cpp 2011-09-04 05:13:03 UTC (rev 4227) +++ trunk/FreeOrion/UI/DesignWnd.cpp 2011-09-04 21:55:56 UTC (rev 4228) @@ -1782,7 +1782,6 @@ DoLayout(); } - void DesignWnd::MainPanel::Sanitize() { SetHull(0); m_design_name->SetText(UserString("DESIGN_NAME_DEFAULT")); @@ -2041,7 +2040,14 @@ const std::string& graphic = m_hull ? m_hull->Graphic() : EMPTY_STRING; // update stored design - m_incomplete_design.reset(new ShipDesign(name, description, empire_id, CurrentTurn(), hull, parts, graphic, "some model")); + try { + m_incomplete_design.reset(new ShipDesign(name, description, empire_id, CurrentTurn(), hull, parts, graphic, "some model")); + } catch (...) { + // had a weird crash in the above call a few times, but I can't seem to + // replicate it now. hopefully catching any exception here will + // prevent crashes and instead just cause the incomplete design details + // to not update when expected. + } } ////////////////////////////////////////////////// Modified: trunk/FreeOrion/default/ship_parts.txt =================================================================== --- trunk/FreeOrion/default/ship_parts.txt 2011-09-04 05:13:03 UTC (rev 4227) +++ trunk/FreeOrion/default/ship_parts.txt 2011-09-04 21:55:56 UTC (rev 4228) @@ -1,3 +1,4 @@ + Part name = "GT_TROOP_POD" description = "GT_TROOP_POD_DESC" |