From 5acd17a9df6b1771b16fdcfba52c98c2beae36cd Mon Sep 17 00:00:00 2001
From: Simon <simonbrown77@googlemail.com>
Date: Sat, 17 Dec 2022 19:44:14 +0000
Subject: [PATCH] Fix config overwrite issue

---
 Projects/Android/AndroidManifest.xml          | 4 ++--
 java/com/drbeef/jkquest/GLES3JNIActivity.java | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Projects/Android/AndroidManifest.xml b/Projects/Android/AndroidManifest.xml
index 621ee72..b2547fa 100644
--- a/Projects/Android/AndroidManifest.xml
+++ b/Projects/Android/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 		package="com.drbeef.jkquest"
-		android:versionCode="32"
-		android:versionName="0.5.1" android:installLocation="auto" >
+		android:versionCode="33"
+		android:versionName="0.5.2" android:installLocation="auto" >
 
 	<!-- Tell the system this app requires OpenGL ES 3.1. -->
 	<uses-feature android:glEsVersion="0x00030002" android:required="true"/>
diff --git a/java/com/drbeef/jkquest/GLES3JNIActivity.java b/java/com/drbeef/jkquest/GLES3JNIActivity.java
index 6ce48b0..d1817aa 100644
--- a/java/com/drbeef/jkquest/GLES3JNIActivity.java
+++ b/java/com/drbeef/jkquest/GLES3JNIActivity.java
@@ -214,10 +214,10 @@ import java.util.Vector;
 		String model = android.os.Build.MODEL;
 		if (model.contains("Quest")) {
 			//Meta Quest
-			copy_asset_device_specific("/sdcard/JKQuest/JK2/base", "openjo_sp_quest.cfg", "openjo_sp.cfg", false);
+			copy_asset_with_rename("/sdcard/JKQuest/JK2/base", "openjo_sp_quest.cfg", "openjo_sp.cfg", false);
 		} else {
 			//Pico XR
-			copy_asset_device_specific("/sdcard/JKQuest/JK2/base", "openjo_sp_pico.cfg", "openjo_sp.cfg", false);
+			copy_asset_with_rename("/sdcard/JKQuest/JK2/base", "openjo_sp_pico.cfg", "openjo_sp.cfg", false);
 		}
 
 		//Read these from a file and pass through
@@ -266,8 +266,8 @@ import java.util.Vector;
 		mNativeHandle = GLES3JNILib.onCreate( this, commandLineParams );
 	}
 
-	public void copy_asset_device_specific(String path, String name, String name_out, boolean force) {
-		File f = new File(path + "/" + name);
+	public void copy_asset_with_rename(String path, String name, String name_out, boolean force) {
+		File f = new File(path + "/" + name_out);
 		if (!f.exists() || force) {
 			
 			//Ensure we have an appropriate folder