mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-03 07:35:48 +08:00
Another attempt to fix copyed hotkeys by updating the identifier
* check on name OR id * remote keys not updated, but lenient check on local machine * Remark: Sometimes copied hotkeys d not work
This commit is contained in:
committed by
Mat Sutcliffe
parent
eb1427e55f
commit
d8a730302a
@@ -361,7 +361,8 @@ namespace BlackGui
|
||||
const QString joStr = CCacheSettingsUtils::otherVersionSettingsFileContent(otherVersionInfo, m_settingsActionHotkeys.getFilename());
|
||||
if (!joStr.isEmpty())
|
||||
{
|
||||
const CActionHotkeyList hotkeys = CActionHotkeyList::fromJsonNoThrow(joStr, true, success, errMsg);
|
||||
CActionHotkeyList hotkeys = CActionHotkeyList::fromJsonNoThrow(joStr, true, success, errMsg);
|
||||
hotkeys.updateToCurrentMachine();
|
||||
if (this->parsingMessage(success, errMsg, m_settingsActionHotkeys.getKey()))
|
||||
{
|
||||
this->displayStatusMessage(m_settingsActionHotkeys.setAndSave(hotkeys), hotkeys.toQString(true));
|
||||
|
||||
Reference in New Issue
Block a user