Author: everaldo
Date: 2007-07-27 12:40:58 -0400 (Fri, 27 Jul 2007)
New Revision: 82871

Modified:
   
branches/mono-1-2-5/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   
branches/mono-1-2-5/mcs/class/Managed.Windows.Forms/System.Windows.Forms/FileDialog.cs
Log:
2007-07-27  Everaldo Canuto  <[EMAIL PROTECTED]>
        [Backport to 1-2-5]
        * FileDialog.cs: Check for valid filterIndex on button open/save.
        Fixes #82184.



Modified: 
branches/mono-1-2-5/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- 
branches/mono-1-2-5/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
  2007-07-27 16:29:51 UTC (rev 82870)
+++ 
branches/mono-1-2-5/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
  2007-07-27 16:40:58 UTC (rev 82871)
@@ -1,3 +1,8 @@
+2007-07-27  Everaldo Canuto  <[EMAIL PROTECTED]>
+       [Backport to 1-2-5]
+       * FileDialog.cs: Check for valid filterIndex on button open/save.
+       Fixes #82184.
+
 2007-07-26  Rolf Bjarne Kvinge <[EMAIL PROTECTED]> 
        [Backport to 1-2-5]
        * Form.cs: ShowDialog: don't destroy handles if the dialog is a common

Modified: 
branches/mono-1-2-5/mcs/class/Managed.Windows.Forms/System.Windows.Forms/FileDialog.cs
===================================================================
--- 
branches/mono-1-2-5/mcs/class/Managed.Windows.Forms/System.Windows.Forms/FileDialog.cs
      2007-07-27 16:29:51 UTC (rev 82870)
+++ 
branches/mono-1-2-5/mcs/class/Managed.Windows.Forms/System.Windows.Forms/FileDialog.cs
      2007-07-27 16:40:58 UTC (rev 82871)
@@ -921,6 +921,9 @@
                                                string filter_exentsion = 
String.Empty;
 
                                                if (fileFilter != null) {
+                                                       if (filterIndex > 
fileFilter.FilterArrayList.Count)
+                                                               filterIndex = 
fileTypeComboBox.SelectedIndex + 1;
+
                                                        FilterStruct 
filterstruct = (FilterStruct) fileFilter.FilterArrayList [filterIndex - 1];
 
                                                        for (int i = 0; i < 
filterstruct.filters.Count; i++) {

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to