2 files changed, 52 insertions, 6 deletions
diff --git a/Swift/Controllers/Highlighting/HighlightAction.cpp b/Swift/Controllers/Highlighting/HighlightAction.cpp
index e9f14df..60ace42 100644
--- a/Swift/Controllers/Highlighting/HighlightAction.cpp
+++ b/Swift/Controllers/Highlighting/HighlightAction.cpp
@@ -14,2 +14,4 @@
 
+BOOST_CLASS_VERSION(Swift::HighlightAction, 1)
+
 namespace Swift {
diff --git a/Swift/Controllers/Highlighting/HighlightAction.h b/Swift/Controllers/Highlighting/HighlightAction.h
index da92901..d11f3ec 100644
--- a/Swift/Controllers/Highlighting/HighlightAction.h
+++ b/Swift/Controllers/Highlighting/HighlightAction.h
@@ -14,2 +14,4 @@
 
+#include <map>
+#include <memory>
 #include <string>
@@ -19,2 +21,3 @@
 #include <boost/optional.hpp>
+#include <boost/serialization/map.hpp>
 #include <boost/serialization/optional.hpp>
@@ -59,10 +62,51 @@ namespace Swift {
 
+
     template<class Archive>
-    void HighlightAction::serialize(Archive& ar, const unsigned int /*version*/) {
-        ar & frontColor_;
-        ar & backColor_;
-        ar & soundFilePath_;
-        ar & systemNotificaitonEnabled_;
+    void HighlightAction::serialize(Archive& ar, const unsigned int version) {
+        auto inputStream = dynamic_cast<boost::archive::text_iarchive*>(&ar);
+        auto outputStream = dynamic_cast<boost::archive::text_oarchive*>(&ar);
+
+        if (version == 0) {
+            if (inputStream) {
+                const boost::archive::library_version_type BoostArchiveSkipVersion(15);
+                auto archiveLibraryVersion = boost::archive::BOOST_ARCHIVE_VERSION();
+                //Due to https://svn.boost.org/trac10/ticket/13050 the boost::optional fields may fail to load and crash the client. Therefore we skip loading the values from previous versions.
+                if (archiveLibraryVersion == BoostArchiveSkipVersion && archiveLibraryVersion > inputStream->get_library_version()) {
+                    return;
+                }
+            }
+            ar & frontColor_;
+            ar & backColor_;
+            ar & soundFilePath_;
+            ar & systemNotificaitonEnabled_;
+        }
+        else if (version == 1) {
+            //Using a map instead of optional values that may cause a problems when serialised with boost::archive 15 version
+            std::map<std::string, std::string> properties;
+            if (outputStream) {
+                if (frontColor_.is_initialized()) {
+                    properties["frontColor"] = frontColor_.get();
+                }
+                if (backColor_.is_initialized()) {
+                    properties["backColor"] = backColor_.get();
+                }
+                if (soundFilePath_.is_initialized()) {
+                    properties["soundFilePath"] = soundFilePath_.get();
+                }
+            }
+            ar & properties;
+            ar & systemNotificaitonEnabled_;
+            if (inputStream) {
+                if (properties.find("frontColor") != properties.end()) {
+                    frontColor_ = properties["frontColor"];
+                }
+                if (properties.find("backColor") != properties.end()) {
+                    backColor_ = properties["backColor"];
+                }
+                if (properties.find("soundFilePath") != properties.end()) {
+                    soundFilePath_ = properties["soundFilePath"];
+                }
+            }
+        }
     }
-
 }