From 67b0e581875dfe8e4704b3f39d4ba0bdba49f7f4 Mon Sep 17 00:00:00 2001 From: hogliux Date: Fri, 17 Feb 2017 11:08:05 +0000 Subject: [PATCH] Added code to ensure that assets are not copied when extra assets paths in Android are not specified --- .../Project Saving/jucer_ProjectExport_Android.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/extras/Projucer/Source/Project Saving/jucer_ProjectExport_Android.h b/extras/Projucer/Source/Project Saving/jucer_ProjectExport_Android.h index df61df31a9..4fc0053208 100644 --- a/extras/Projucer/Source/Project Saving/jucer_ProjectExport_Android.h +++ b/extras/Projucer/Source/Project Saving/jucer_ProjectExport_Android.h @@ -218,12 +218,16 @@ public: writeCmakeFile (appFolder.getChildFile ("CMakeLists.txt")); - File extraAssets (getProject().getFile().getParentDirectory().getChildFile(androidExtraAssetsFolder.get())); - if (extraAssets.exists() && extraAssets.isDirectory()) + const String androidExtraAssetsFolderValue = androidExtraAssetsFolder.get(); + if (androidExtraAssetsFolderValue.isNotEmpty()) { - const File assetsFolder (appFolder.getChildFile ("src/main/assets")); - if (assetsFolder.deleteRecursively()) - extraAssets.copyDirectoryTo (assetsFolder); + File extraAssets (getProject().getFile().getParentDirectory().getChildFile(androidExtraAssetsFolderValue)); + if (extraAssets.exists() && extraAssets.isDirectory()) + { + const File assetsFolder (appFolder.getChildFile ("src/main/assets")); + if (assetsFolder.deleteRecursively()) + extraAssets.copyDirectoryTo (assetsFolder); + } } }