Merge pull request #11 from ciribob/splashChanges

Release 1.4.1
ciribob · Mar 25, 2016 · d5d0d3d · d5d0d3d
2 parents 226b296 + 12440ba
commit d5d0d3d
Show file tree

Hide file tree

Showing 9 changed files with 440 additions and 104 deletions.
diff --git a/Installer/MainWindow.xaml.cs b/Installer/MainWindow.xaml.cs
@@ -27,7 +27,7 @@ public partial class MainWindow
     {
         const string REG_PATH = "HKEY_CURRENT_USER\\SOFTWARE\\DCS-SimpleRadio";
 
-        const string version = "1.3.0";
+        const string version = "1.4.1";
 
         string currentPath;
         string currentDirectory;

diff --git a/Plugin/ClientMetaData.cpp b/Plugin/ClientMetaData.cpp
@@ -24,6 +24,8 @@ namespace SimpleRadio
 			this->radio[i].modulation = 0;
 			this->radio[i].volume = 1.0;
 			this->radio[i].secondaryFrequency = -1;
+			this->radio[i].freqMin = -1;
+			this->radio[i].freqMax = -1;
 		}
 	}
 
@@ -45,6 +47,8 @@ namespace SimpleRadio
 			current["modulation"] = this->radio[i].modulation;
 			current["volume"] = this->radio[i].volume;
 			current["secondaryFrequency"] = this->radio[i].secondaryFrequency;
+		//	current["freqMin"] = this->radio[i].freqMin;
+	//		current["freqMax"] = this->radio[i].freqMax;
 			array.append(current);
 		}
 
@@ -97,6 +101,24 @@ namespace SimpleRadio
 					data.radio[i].secondaryFrequency = -1;
 				}
 
+				try {
+					data.radio[i].freqMax = std::stod(root["radios"][i]["freqMax"].asString());
+				}
+				catch (...)
+				{
+					//catch older versions
+					data.radio[i].freqMax = -1;
+				}
+
+				try {
+					data.radio[i].freqMin = std::stod(root["radios"][i]["freqMin"].asString());
+				}
+				catch (...)
+				{
+					//catch older versions
+					data.radio[i].freqMin = -1;
+				}
+
 			}