Merge pull request #9703 from Filoppi/fix_expression_serialization

Fix serialization of control expressions with line breaks

1 files changed, 7 insertions, 2 deletions

diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.cpp
index 84c7238e48..2862445392 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.cpp
@@ -117,7 +117,10 @@ void ControlGroup::SaveConfig(IniFile::Section* sec, const std::string& defdev,
   for (auto& c : controls)
   {
     // control expression
-    sec->Set(group + c->name, c->control_ref->GetExpression(), "");
+    std::string expression = c->control_ref->GetExpression();
+    // We can't save line breaks in a single line config. Restoring them is too complicated.
+    ReplaceBreaksWithSpaces(expression);
+    sec->Set(group + c->name, expression, "");
 
     // range
     sec->Set(group + c->name + "/Range", c->control_ref->range * 100.0, 100.0);
@@ -135,7 +138,9 @@ void ControlGroup::SaveConfig(IniFile::Section* sec, const std::string& defdev,
     }
     else
     {
-      sec->Set(base + name, ext->GetSelectionSetting().GetInputReference().GetExpression(), "None");
+      std::string expression = ext->GetSelectionSetting().GetInputReference().GetExpression();
+      ReplaceBreaksWithSpaces(expression);
+      sec->Set(base + name, expression, "None");
     }
 
     for (auto& ai : ext->GetAttachmentList())