A malformed or broken addon page url will no longer crash Meldii when…

… being opened
GoomiiV2 · Jan 23, 2016 · d30731b · d30731b
1 parent 8b869a1
commit d30731b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/Meldii/Meldii.DataStructures/AddonMetaData.cs b/Meldii/Meldii.DataStructures/AddonMetaData.cs
@@ -273,6 +273,14 @@ public void ReadFromIni(TextReader reader)
                             break;
                         case "url":
                             AddonPage = value;
+                            // Valadate it
+                            Uri uriResult;
+                            bool isValidUrl = Uri.TryCreate(AddonPage, UriKind.Absolute, out uriResult) && (uriResult.Scheme == Uri.UriSchemeHttp || uriResult.Scheme == Uri.UriSchemeHttps);
+                            if (!isValidUrl)
+                            {
+                                AddonPage = "";
+                                //Debug.Assert(false);
+                            }
                             break;
                         case "source":
                             Source = value;

diff --git a/Meldii/Meldii.Views/MainViewModel.cs b/Meldii/Meldii.Views/MainViewModel.cs
@@ -57,10 +57,14 @@ public bool IsPendingVersionCheck
             }
         }
 
-        public void OnOpenAddonPage()
+        public async void OnOpenAddonPage()
         {
             if (SelectedAddon != null && SelectedAddon.AddonPage != null && SelectedAddon.AddonPage.Length > 0)
                 Process.Start(SelectedAddon.AddonPage);
+            else
+            {
+                await MainWindow.ShowMessageDialogYesNo("Error opening addon page", "Either this addon has no addon page set or it was a malformed url format");
+            }
         }
 
         public void OpenAddonLocation()

diff --git a/Release/Meldii.exe b/Release/Meldii.exe