[Commits] [wesnoth/wesnoth] 240f3c: Avoid crash when planning moves on planned recruit...

[GitHub]

  Branch: refs/heads/1.12
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 240f3c0c5291d550f3308a76b717f15163abd64b
      https://github.com/wesnoth/wesnoth/commit/240f3c0c5291d550f3308a76b717f15163abd64b
  Author: Wedge009 <wedge009 at wedge009.net>
  Date:   2015-11-05 (Thu, 05 Nov 2015)

  Changed paths:
    M changelog
    M src/whiteboard/move.cpp

  Log Message:
  -----------
  Avoid crash when planning moves on planned recruits (Bug #18637)

Attempt to work-around bug #18637, where planning moves on planned recruits results in a crash (because get_unit() is null when move::init() is called).

This isn't a comprehensive fix because clicking on a planned recruit will still result in the usual display feedback for planning a move. The difference here is that attempting to place a planned move will result in nothing happening when the mouse button is clicked (as opposed to the assertion failure or crash which happens currently). It is better than nothing, I believe, unless there are negative side-effects of which I am unaware of.

As per the bug report, the ideal solution is to either get planned moves on planned recruits working properly, or disallow this movement altogether.


  Commit: 229126d6381e33c4f2acbdef546c74cf1a28378c
      https://github.com/wesnoth/wesnoth/commit/229126d6381e33c4f2acbdef546c74cf1a28378c
  Author: Ignacio R. Morelle <shadowm at wesnoth.org>
  Date:   2015-11-05 (Thu, 05 Nov 2015)

  Changed paths:
    M changelog
    M src/whiteboard/move.cpp

  Log Message:
  -----------
  Merge branch 'staging/pr-497-1.12' into 1.12


Compare: https://github.com/wesnoth/wesnoth/compare/45f9dd4b6e30...229126d6381e