Merge pull request #8728 from Agsayt/Issue/6334

fix: Fixed AccessViolationException that occurs in GLibSharp.dll after storage picker interaction
unoplatform · May 10, 2022 · 6d7f534 · 6d7f534
2 parents cd24160 + 2bd123f
commit 6d7f534
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/src/Uno.UI.Runtime.Skia.Gtk/Extensions/Storage/Pickers/FileOpenPickerExtension.cs b/src/Uno.UI.Runtime.Skia.Gtk/Extensions/Storage/Pickers/FileOpenPickerExtension.cs
@@ -41,7 +41,7 @@ private async Task<StorageFile[]> OpenPickerAsync(bool multiple)
 				commitText = _picker.CommitButtonText;
 			}
 
-			FileChooserDialog dialog = new FileChooserDialog(
+			using FileChooserDialog dialog = new FileChooserDialog(
 				"Open",
 				GtkHost.Window,
 				FileChooserAction.Open,
@@ -77,7 +77,6 @@ private async Task<StorageFile[]> OpenPickerAsync(bool multiple)
 				}
 			}
 
-			dialog.Destroy();
 			return files.ToArray();
 		}
 	}

diff --git a/src/Uno.UI.Runtime.Skia.Gtk/Extensions/Storage/Pickers/FileSavePickerExtension.cs b/src/Uno.UI.Runtime.Skia.Gtk/Extensions/Storage/Pickers/FileSavePickerExtension.cs
@@ -28,7 +28,7 @@ public FileSavePickerExtension(FileSavePicker owner)
 				commitText = _picker.CommitButtonText;
 			}
 
-			FileChooserDialog dialog = new FileChooserDialog(
+			using FileChooserDialog dialog = new FileChooserDialog(
 			"Save File",
 			GtkHost.Window,
 			FileChooserAction.Save,
@@ -49,7 +49,7 @@ public FileSavePickerExtension(FileSavePicker owner)
 				file = await StorageFile.GetFileFromPathAsync(dialog.Filename);				
 			}
 
-			dialog.Destroy();
+
 			return file;
 		}
 	}

diff --git a/src/Uno.UI.Runtime.Skia.Gtk/Extensions/Storage/Pickers/FolderPickerExtension.cs b/src/Uno.UI.Runtime.Skia.Gtk/Extensions/Storage/Pickers/FolderPickerExtension.cs
@@ -27,7 +27,7 @@ public FolderPickerExtension(FolderPicker owner)
 				commitText = _picker.CommitButtonText;
 			}
 
-			FileChooserDialog dialog = new FileChooserDialog(
+			using FileChooserDialog dialog = new FileChooserDialog(
 				"Select Folder",
 				GtkHost.Window,
 				FileChooserAction.SelectFolder,
@@ -49,7 +49,6 @@ public FolderPickerExtension(FolderPicker owner)
 				folder = await StorageFolder.GetFolderFromPathAsync(dialog.Filename);
 			}
 
-			dialog.Destroy();
 			return folder;
 		}
 	}