simon-git: puzzles (master): Simon Tatham

[Commits to Tartarus hosted VCS]

TL;DR:
  ced51ad Replace fe->preset_menu when we change midend.

Repository:     https://git.tartarus.org/simon/puzzles.git
On the web:     https://git.tartarus.org/?p=simon/puzzles.git
Branch updated: master
Committer:      Simon Tatham <anakin at pobox.com>
Date:           2018-12-12 22:25:40

commit ced51ada363d895eee796dd03923042f97f95321
web diff https://git.tartarus.org/?p=simon/puzzles.git;a=commitdiff;h=ced51ada363d895eee796dd03923042f97f95321;hp=0a5d13bcd5e6a88418abaf528d9d529ced7dfb9c
Author: Simon Tatham <anakin at pobox.com>
Date:   Wed Dec 12 22:18:00 2018 +0000

    Replace fe->preset_menu when we change midend.
    
    Thanks to Rocco Matano for reporting that in the -DCOMBINED version of
    the Windows front end, switching games causes a crash because the
    presets menu from the old midend is still left over in fe, and its
    presence inhibits the setup code from making a new one. Now we throw
    it out at the same time as we throw out the old midend itself.
    
    Also, the condition 'if (!fe->preset_menu)' was misguided. I think the
    point of that was to avoid pointlessly tearing down and rebuilding the
    preset menu when we're _not_ changing game - but that's a cost too
    small to worry about if it causes the slightest trouble. Now
    fe->preset_menu should always be NULL at that point in the function,
    so I've replaced the if with an assert.

 windows.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)