[wesnoth-commits] [wesnoth/wesnoth] f2202f: Save prefs to disk when exiting the Preferences di...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: f2202fc76a24601e5a49f2d1c12b12f82a95febb
      https://github.com/wesnoth/wesnoth/commit/f2202fc76a24601e5a49f2d1c12b12f82a95febb
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2018-02-21 (Wed, 21 Feb 2018)

  Changed paths:
    M src/gui/dialogs/preferences_dialog.cpp

  Log Message:
  -----------
  Save prefs to disk when exiting the Preferences dialog

Fixes #1809.


  Commit: 0b87383fd96430e0ea64e43cf356d2ddce57631f
      https://github.com/wesnoth/wesnoth/commit/0b87383fd96430e0ea64e43cf356d2ddce57631f
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2018-02-21 (Wed, 21 Feb 2018)

  Changed paths:
    M src/gui/dialogs/preferences_dialog.cpp

  Log Message:
  -----------
  Preferences Dialog: fixed minor regression from a77652986a0b3df9a9f

Accidentally put the +1 in the beginning range instead of adding to the resumt.


  Commit: 2523493e7490633a8f253c69d4f9a953a7c8d165
      https://github.com/wesnoth/wesnoth/commit/2523493e7490633a8f253c69d4f9a953a7c8d165
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2018-02-21 (Wed, 21 Feb 2018)

  Changed paths:
    M src/game_config_manager.cpp
    M src/wesnoth.cpp

  Log Message:
  -----------
  Fixed hotkey prefs being lost after installing addons (fixes #2532)

The problem was that game_config_manager::init_game_config was called (via reload_changed_game_config)
after an addon was installed, which loaded the standard game-defined hotkeys. The loading of hotkey
preferences was relegated to the main game loop (do_gameloop). However, that loop wasn't entered again
when installing addons, since technically you never left the titlescreen, so the default hotkeys were
being re-loaded but not the prefs one.

I've moved loading of both to the same place to prevent any further issues.


Compare: https://github.com/wesnoth/wesnoth/compare/a2eb75db6c79...2523493e7490