use separate functions for importing and resetting default shortcuts * shortcut-manager.h, shortcut-manager.cc (shortcut_manager::import_shortcuts): Don't reset defaults if settings is nullptr. Handle that case in a separate function. (shortcut_manager::reset_default_shortcuts): New function, adapted from previous import_shortcuts function.