Fixed NullReferenceException and added queries

dbforge · Jun 5, 2015 · ae6de31 · ae6de31
1 parent 61ae7ff
commit ae6de31
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/nUpdate/UI/Dialogs/NewUpdateDialog.cs b/nUpdate/UI/Dialogs/NewUpdateDialog.cs
@@ -160,7 +160,10 @@ private void NewUpdateDialog_Load(object sender, EventArgs e)
 
         public void ShowModalDialog(object dialogResultReference)
         {
-            ((DialogResultReference)dialogResultReference).DialogResult = ShowDialog();
+            if (dialogResultReference != null)
+                ((DialogResultReference)dialogResultReference).DialogResult = ShowDialog();
+            else
+                ShowDialog();
         }
 
         public void CloseDialog(object state)

diff --git a/nUpdate/UI/Dialogs/NoUpdateFoundDialog.cs b/nUpdate/UI/Dialogs/NoUpdateFoundDialog.cs
@@ -66,7 +66,10 @@ private void NoUpdateFoundDialog_Load(object sender, EventArgs e)
 
         public void ShowModalDialog(object dialogResultReference)
         {
-            ShowDialog();
+            if (dialogResultReference != null)
+                ((DialogResultReference)dialogResultReference).DialogResult = ShowDialog();
+            else
+                ShowDialog();
         }
 
         public void CloseDialog(object state)

diff --git a/nUpdate/UI/Dialogs/UpdateDownloadDialog.cs b/nUpdate/UI/Dialogs/UpdateDownloadDialog.cs
@@ -109,7 +109,10 @@ private void UpdateDownloadDialog_Load(object sender, EventArgs e)
 
         public void ShowModalDialog(object dialogResultReference)
         {
-            ((DialogResultReference)dialogResultReference).DialogResult = ShowDialog();
+            if (dialogResultReference != null)
+                ((DialogResultReference)dialogResultReference).DialogResult = ShowDialog();
+            else
+                ShowDialog();
         }
 
         public void CloseDialog(object state)

diff --git a/nUpdate/UI/Dialogs/UpdateSearchDialog.cs b/nUpdate/UI/Dialogs/UpdateSearchDialog.cs
@@ -86,7 +86,10 @@ public void Fail(Exception ex)
 
         public void ShowModalDialog(object dialogResultReference)
         {
-            ((DialogResultReference)dialogResultReference).DialogResult = ShowDialog();
+            if (dialogResultReference != null)
+                ((DialogResultReference)dialogResultReference).DialogResult = ShowDialog();
+            else
+                ShowDialog();
         }
 
         public void CloseDialog(object state)