changes to shortcut topic for keyboard viewer

This commit is contained in:
Micah
2021-09-14 12:28:57 -04:00
parent af95d9895e
commit 550e088d60
2 changed files with 7 additions and 2 deletions

View File

@@ -78,7 +78,7 @@ std::vector<nlohmann::json> ShortcutTopic::shortcutsJson() const {
{ "super" , hasKeyModifier(k.modifier, KeyModifier::Super) }
}
},
{ "action", action.name },
{ "action", action.identifier },
};
json.push_back(shortcutJson);
}

View File

@@ -166,7 +166,12 @@ void WebGuiModule::internalInitialize(const ghoul::Dictionary& configuration) {
const Parameters p = codegen::bake<Parameters>(configuration);
_port = p.port.value_or(_port);
_address = p.address.value_or(_address);
if (p.address.has_value()) {
_address = p.address.value();
}
else {
_address = "192.168.1.8"; //global::windowDelegate
}
_webSocketInterface = p.webSocketInterface.value_or(_webSocketInterface);
auto startOrStop = [this]() {