Fixed making trash foldaer. Avoiding deadlock is generally a good idea

diff --git a/Radegast/GUI/Consoles/Inventory/InventoryConsole.cs b/Radegast/GUI/Consoles/Inventory/InventoryConsole.cs
index 8a0f27d..f000fff 100644 (file)
--- a/Radegast/GUI/Consoles/Inventory/InventoryConsole.cs
+++ b/Radegast/GUI/Consoles/Inventory/InventoryConsole.cs
@@ -1706,8 +1706,8 @@ namespace Radegast
                                 trashCreated.WaitOne(20 * 1000, false);
                                 Thread.Sleep(200);
                                 client.Inventory.MoveFolder(f.UUID, trash, f.Name);
-                                return;
                             });
+                            return;
                         }
 
                         client.Inventory.MoveFolder(f.UUID, trash, f.Name);
@@ -1816,8 +1816,8 @@ namespace Radegast
                                 trashCreated.WaitOne(20 * 1000, false);
                                 Thread.Sleep(200);
                                 client.Inventory.MoveItem(item.UUID, trash, item.Name);
-                                return;
                             });
+                            return;
                         }
 
                         client.Inventory.MoveItem(item.UUID, client.Inventory.FindFolderForType(AssetType.TrashFolder), item.Name);
@@ -2181,15 +2181,22 @@ namespace Radegast
             }
             else if (e.KeyCode == Keys.Delete && invTree.SelectedNode != null)
             {
+                var trash = client.Inventory.FindFolderForType(AssetType.TrashFolder);
+                if (trash == Inventory.RootFolder.UUID)
+                {
+                    trash = client.Inventory.CreateFolder(Inventory.RootFolder.UUID, "Trash", AssetType.TrashFolder);
+                    Thread.Sleep(2000);
+                }
+
                 if (invTree.SelectedNode.Tag is InventoryItem)
                 {
                     InventoryItem item = invTree.SelectedNode.Tag as InventoryItem;
-                    client.Inventory.MoveItem(item.UUID, client.Inventory.FindFolderForType(AssetType.TrashFolder), item.Name);
+                    client.Inventory.MoveItem(item.UUID, trash, item.Name);
                 }
                 else if (invTree.SelectedNode.Tag is InventoryFolder)
                 {
                     InventoryFolder f = invTree.SelectedNode.Tag as InventoryFolder;
-                    client.Inventory.MoveFolder(f.UUID, client.Inventory.FindFolderForType(AssetType.TrashFolder), f.Name);
+                    client.Inventory.MoveFolder(f.UUID, trash, f.Name);
                 }
             }
             else if (e.KeyCode == Keys.Apps && invTree.SelectedNode != null)