Browse Source

Merge remote-tracking branch 'origin/master'

Patrick-Laptop 3 years ago
parent
commit
c5ca494199

+ 2 - 2
source/io/logging/LogLevel.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-20
- * Changed:         2020-09-04
+ * Changed:         2020-10-02
  *
  * */
 
@@ -30,7 +30,7 @@ namespace ls_std {
 
     private:
 
-      std::unordered_map<ls_std::LogLevelValue, std::string> level {};
+      std::unordered_map<uint8_t , std::string> level {};
       ls_std::LogLevelValue value {};
 
       void _init();

+ 3 - 1
source/serialization/json/logic/SerializableJSONState.cpp

@@ -50,7 +50,9 @@ void ls_std::SerializableJSONState::_unmarshalExistingStateConnection(nlohmann::
 
 void ls_std::SerializableJSONState::_unmarshalNewStateConnection(nlohmann::json _jsonObject)
 {
-  std::shared_ptr<ls_std::StateConnection> stateConnection = std::make_shared<ls_std::StateConnection>(_jsonObject["connectionId"], _jsonObject["stateId"]);
+  ls_std::StateConnectionId connectionId = _jsonObject["connectionId"];
+  ls_std::StateId stateId = _jsonObject["stateId"];
+  std::shared_ptr<ls_std::StateConnection> stateConnection = std::make_shared<ls_std::StateConnection>(connectionId, stateId);
   stateConnection->updatePassCondition(_jsonObject["condition"]);
 
   this->value->addStateConnection(stateConnection);