Merge branch 'fix' into 'pregmod-master'

fix hotkeys not added on reload

Closes #1999

See merge request !7312

src/002-config/mousetrapConfig.js

@@ -238,6 +238,7 @@ App.UI.Hotkeys = (function() {
 			// discard obsolete hotkeys
 			if (actions[saveKey]) {
 				actions[saveKey].combinations = save[saveKey];
+				addBinding(saveKey, save[saveKey]);
 			}
 		}
 	}

src/js/eventHandlers.js

@@ -22,6 +22,7 @@ App.EventHandlers = function() {
 	}
 
 	function storyReady() {
+		App.UI.Hotkeys.init();
 	}
 
 	function optionsChanged() {

src/zz1-last/setupEventHandlers.js

@@ -4,7 +4,6 @@ Config.saves.onSave = App.EventHandlers.onSave;
 
 $(document).on(':storyready', function() {
 	App.EventHandlers.storyReady();
-	App.UI.Hotkeys.init();
 });
 
 $(document).one(':passagestart', function() {