Merge pull request #83 from zetsumi/fix/delete_folder

Adrien GIVRY · web-flow · commit cb7997ef9f42 · 2020-06-07T21:45:32.000-04:00
Editor crashes when deleting an already deleted file/folder
diff --git a/Sources/Overload/OvEditor/src/OvEditor/Panels/AssetBrowser.cpp b/Sources/Overload/OvEditor/src/OvEditor/Panels/AssetBrowser.cpp
@@ -509,9 +509,12 @@ class FolderContextualMenu : public BrowserItemContextualMenu
 
 		if (message.GetUserAction() == MessageBox::EUserAction::YES)
 		{
-			EDITOR_EXEC(PropagateFolderDestruction(filePath));
-			std::filesystem::remove_all(filePath);
-			DestroyedEvent.Invoke(filePath);
+			if (std::filesystem::exists(filePath) == true)
+			{
+				EDITOR_EXEC(PropagateFolderDestruction(filePath));
+				std::filesystem::remove_all(filePath);
+				DestroyedEvent.Invoke(filePath);
+			}
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -509,9 +509,12 @@ class FolderContextualMenu : public BrowserItemContextualMenu`
`509`	`509`
`510`	`510`	`if (message.GetUserAction() == MessageBox::EUserAction::YES)`
`511`	`511`	`{`
`512`		`- EDITOR_EXEC(PropagateFolderDestruction(filePath));`
`513`		`- std::filesystem::remove_all(filePath);`
`514`		`- DestroyedEvent.Invoke(filePath);`
	`512`	`+ if (std::filesystem::exists(filePath) == true)`
	`513`	`+ {`
	`514`	`+ EDITOR_EXEC(PropagateFolderDestruction(filePath));`
	`515`	`+ std::filesystem::remove_all(filePath);`
	`516`	`+ DestroyedEvent.Invoke(filePath);`
	`517`	`+ }`
`515`	`518`	`}`
`516`	`519`	`}`
`517`	`520`