Merge pull request #30 from winglessraven/dev

Fix error when clicking on whitespace in character list

Dead Matter Server Manager/Dead Matter Server Manager/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.12.0.0")]
-[assembly: AssemblyFileVersion("1.12.0.0")]
+[assembly: AssemblyVersion("1.12.1.0")]
+[assembly: AssemblyFileVersion("1.12.1.0")]

Dead Matter Server Manager/Dead Matter Server Manager/ServerManager.cs

@@ -2723,64 +2723,67 @@ private void serverPlayers_SelectedIndexChanged(object sender, EventArgs e)
         private void playerCharacters_SelectedIndexChanged(object sender, EventArgs e)
         {
             inventoryData.Text = "";
-            Character character = (Character)playerCharacters.SelectedItem;
-            int tmp = character.CharacterKey;
-
-            string connectionString = @"Data Source=" + serverFolderPath.Text + "\\" + @"deadmatter\Saved\Database\" + currentDBfile + ";Version=3;Read Only=True";
-
-            SQLiteConnection connection = new SQLiteConnection(connectionString);
-            try
+            if (playerCharacters.SelectedItem != null)
             {
-                connection.Open();
+                Character character = (Character)playerCharacters.SelectedItem;
+                int tmp = character.CharacterKey;
 
-                string queryTxt = "SELECT Transform, InventoryData FROM Characters WHERE ID = '" + tmp + "'";
-                SQLiteCommand command = new SQLiteCommand(queryTxt, connection);
-                SQLiteDataReader reader = command.ExecuteReader();
+                string connectionString = @"Data Source=" + serverFolderPath.Text + "\\" + @"deadmatter\Saved\Database\" + currentDBfile + ";Version=3;Read Only=True";
 
-                while (reader.Read())
+                SQLiteConnection connection = new SQLiteConnection(connectionString);
+                try
                 {
-                    string[] temp = reader[0].ToString().Split('|');
-                    string xPos = temp[0].Split(',')[0];
-                    string yPos = temp[0].Split(',')[1];
-                    string zPos = temp[0].Split(',')[2];
+                    connection.Open();
 
-                    CharacterLocation characterLocation = new CharacterLocation();
-                    characterLocation.CharacterKey = tmp;
-                    characterLocation.TranslationX = Convert.ToDouble(xPos);
-                    characterLocation.TranslationY = Convert.ToDouble(yPos);
-                    characterLocation.TranslationZ = Convert.ToDouble(zPos);
+                    string queryTxt = "SELECT Transform, InventoryData FROM Characters WHERE ID = '" + tmp + "'";
+                    SQLiteCommand command = new SQLiteCommand(queryTxt, connection);
+                    SQLiteDataReader reader = command.ExecuteReader();
 
-                    xPosition.Text = "Position X: " + characterLocation.TranslationX;
-                    yPosition.Text = "Position Y: " + characterLocation.TranslationY;
-                    zPosition.Text = "Position Z: " + characterLocation.TranslationZ;
+                    while (reader.Read())
+                    {
+                        string[] temp = reader[0].ToString().Split('|');
+                        string xPos = temp[0].Split(',')[0];
+                        string yPos = temp[0].Split(',')[1];
+                        string zPos = temp[0].Split(',')[2];
 
-                    string[] items = reader[1].ToString().Split(new string[] { "ItemId=" }, StringSplitOptions.None);
-                    List<string> itemNames = new List<string>();
+                        CharacterLocation characterLocation = new CharacterLocation();
+                        characterLocation.CharacterKey = tmp;
+                        characterLocation.TranslationX = Convert.ToDouble(xPos);
+                        characterLocation.TranslationY = Convert.ToDouble(yPos);
+                        characterLocation.TranslationZ = Convert.ToDouble(zPos);
 
-                    foreach (string s in items)
-                    {
-                        string[] split = s.Split(',');
-                        itemNames.Add(split[0]);
-                    }
+                        xPosition.Text = "Position X: " + characterLocation.TranslationX;
+                        yPosition.Text = "Position Y: " + characterLocation.TranslationY;
+                        zPosition.Text = "Position Z: " + characterLocation.TranslationZ;
 
-                    foreach (string s in itemNames)
-                    {
-                        if (!s.StartsWith("(EquipmentInventory"))
+                        string[] items = reader[1].ToString().Split(new string[] { "ItemId=" }, StringSplitOptions.None);
+                        List<string> itemNames = new List<string>();
+
+                        foreach (string s in items)
                         {
-                            string trim = s.Replace(")", "");
-                            trim = trim.Replace("\"", "");
-                            inventoryData.AppendText(trim + Environment.NewLine);
+                            string[] split = s.Split(',');
+                            itemNames.Add(split[0]);
+                        }
+
+                        foreach (string s in itemNames)
+                        {
+                            if (!s.StartsWith("(EquipmentInventory"))
+                            {
+                                string trim = s.Replace(")", "");
+                                trim = trim.Replace("\"", "");
+                                inventoryData.AppendText(trim + Environment.NewLine);
+                            }
                         }
                     }
                 }
-            }
-            catch(Exception exception)
-            {
-                //error connecting to db - do something
-                xPosition.Text = "";
-                yPosition.Text = "";
-                zPosition.Text = "";
-                inventoryData.Text = "";
+                catch (Exception exception)
+                {
+                    //error connecting to db - do something
+                    xPosition.Text = "";
+                    yPosition.Text = "";
+                    zPosition.Text = "";
+                    inventoryData.Text = "";
+                }
             }
         }
 

Dead Matter Server Manager/DeadMatterServerManagerInstaller/DeadMatterServerManagerInstaller.vdproj

@@ -6766,15 +6766,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Dead Matter Server Manager"
-        "ProductCode" = "8:{C67FD7CF-B74A-49D3-A713-15DA530AFFAD}"
-        "PackageCode" = "8:{58AB8DBE-9ABC-4CCA-B9FD-4C4D217CA778}"
+        "ProductCode" = "8:{40E340E9-2970-491A-94F6-37ECBC2BBD9D}"
+        "PackageCode" = "8:{E1C51005-6589-4E96-B8BC-D2137B1C60FA}"
         "UpgradeCode" = "8:{BC345328-E944-4F2F-9559-E95043070B11}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:1.12.0"
+        "ProductVersion" = "8:1.12.1"
         "Manufacturer" = "8:winglessraven"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"