diff --git a/core/linux/common.cpp b/core/linux/common.cpp
index 6f0c96169..ae02e6b48 100644
--- a/core/linux/common.cpp
+++ b/core/linux/common.cpp
@@ -193,7 +193,7 @@ void cResetEvent::Wait()//Wait for signal , then reset
 void VArray2::LockRegion(u32 offset,u32 size)
 {
 	#if !defined(TARGET_NO_EXCEPTIONS)
-  u32 inpage=offset & PAGE_MASK;
+	u32 inpage=offset & PAGE_MASK;
 	u32 rv=mprotect (data+offset-inpage, size+inpage, PROT_READ );
 	if (rv!=0)
 	{
@@ -244,7 +244,7 @@ void print_mem_addr()
 void VArray2::UnLockRegion(u32 offset,u32 size)
 {
 	#if !defined(TARGET_NO_EXCEPTIONS)
-  u32 inpage=offset & PAGE_MASK;
+	u32 inpage=offset & PAGE_MASK;
 	u32 rv=mprotect (data+offset-inpage, size+inpage, PROT_READ | PROT_WRITE);
 	if (rv!=0)
 	{
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/OptionsFragment.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/OptionsFragment.java
index 356aed2ef..338383dde 100644
--- a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/OptionsFragment.java
+++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/OptionsFragment.java
@@ -451,10 +451,11 @@ public class OptionsFragment extends Fragment {
 					String disk = editText.toString();
 					if (disk.substring(disk.lastIndexOf("/") + 1).length() == 0) {
                         disk = "null";
+						bootdiskEdit.setText(disk);
                     } else if (!disk.equals("null") && !disk.contains("/")) {
 						disk = game_directory + "/" + disk;
+						bootdiskEdit.setText(disk);
 					}
-					bootdiskEdit.setText(disk);
 					mPrefs.edit().putString(Emulator.pref_bootdisk, disk).apply();
 					Emulator.bootdisk = disk;
 				}
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/JNIdc.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/JNIdc.java
index 8dc38e99e..3eee04438 100644
--- a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/JNIdc.java
+++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/JNIdc.java
@@ -26,7 +26,7 @@ public final class JNIdc
 	public static native void initControllers(boolean[] controllers, int[][] peripherals);
 
 	public static native void setupMic(Object sip);
-	public static native void diskSwap(String disk);
+	public static native void diskSwap();
 	public static native void vmuSwap();
 	public static native void setupVmu(Object sip);
 	public static native void dynarec(int dynarec);
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/OnScreenMenu.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/OnScreenMenu.java
index 5cdc35593..f4aaa1907 100644
--- a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/OnScreenMenu.java
+++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/OnScreenMenu.java
@@ -496,7 +496,7 @@ public class OnScreenMenu {
 
 			OnClickListener clickDisk = new OnClickListener() {
 				public void onClick(View v) {
-					JNIdc.diskSwap(null);
+					JNIdc.diskSwap();
 					dismiss();
 				}
 			};
diff --git a/shell/android-studio/reicast/src/main/jni/src/Android.cpp b/shell/android-studio/reicast/src/main/jni/src/Android.cpp
index 924c614c5..2fac7c0e2 100644
--- a/shell/android-studio/reicast/src/main/jni/src/Android.cpp
+++ b/shell/android-studio/reicast/src/main/jni/src/Android.cpp
@@ -17,6 +17,7 @@
 #include "hw/maple/maple_if.h"
 #include "oslib/audiobackend_android.h"
 #include "reios/reios.h"
+#include "imgread/common.h"
 
 extern "C"
 {
@@ -40,7 +41,7 @@ JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_vjoy(JNIEnv * env, jo
 JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_initControllers(JNIEnv *env, jobject obj, jbooleanArray controllers, jobjectArray peripherals)  __attribute__((visibility("default")));
 
 JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_setupMic(JNIEnv *env,jobject obj,jobject sip)  __attribute__((visibility("default")));
-JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_diskSwap(JNIEnv *env,jobject obj, jstring newdisk)  __attribute__((visibility("default")));
+JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_diskSwap(JNIEnv *env,jobject obj)  __attribute__((visibility("default")));
 JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_vmuSwap(JNIEnv *env,jobject obj)  __attribute__((visibility("default")));
 JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_setupVmu(JNIEnv *env,jobject obj,jobject sip)  __attribute__((visibility("default")));
 
@@ -186,7 +187,6 @@ bool gles_init();
 extern int screen_width,screen_height;
 
 static u64 tvs_base;
-static char bootdisk[256];
 static char gamedisk[256];
 
 // Additonal controllers 2, 3 and 4 connected ?
@@ -310,14 +310,17 @@ JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_config(JNIEnv *env,jo
 JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_bootdisk(JNIEnv *env,jobject obj, jstring disk)
 {
     const char* P = disk? env->GetStringUTFChars(disk,0):0;
-    if(!P) bootdisk[0] = '\0';
+    if(!P) settings.imgread.DefaultImage[0] = '\0';
     else
     {
         printf("Got URI: '%s'\n",P);
-        strncpy(bootdisk,(strlen(P)>=7)&&!memcmp(P,"file://",7)? P+7:P,sizeof(bootdisk));
-        bootdisk[sizeof(bootdisk)-1] = '\0';
+        strncpy(settings.imgread.DefaultImage,(strlen(P)>=7)&&!memcmp(P,"file://",7)? P+7:P,sizeof(settings.imgread.DefaultImage));
+        settings.imgread.DefaultImage[sizeof(settings.imgread.DefaultImage)-1] = '\0';
         env->ReleaseStringUTFChars(disk,P);
     }
+
+    if (strcmp(settings.imgread.DefaultImage, "null") != 0)
+        settings.imgread.LoadDefaultImage = 1;
 }
 
 JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_init(JNIEnv *env,jobject obj,jstring fileName)
@@ -350,10 +353,7 @@ JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_init(JNIEnv *env,jobj
   pthread_attr_destroy(&PTAttr);
   */
 
-    if (strcmp(bootdisk, "null") != 0)
-        ThreadHandler(bootdisk);
-    else
-        ThreadHandler(gamedisk);
+    ThreadHandler(gamedisk);
 }
 
 #define SAMPLE_COUNT 512
@@ -447,8 +447,9 @@ JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_destroy(JNIEnv *env,j
 
 JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_diskSwap(JNIEnv *env,jobject obj)
 {
-    // Needs actual code to swap a disk
-    // bootdisk is replaced by gamedisk
+    settings.imgread.LoadDefaultImage = 0;
+
+    DiscSwap();
 }
 
 JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_vmuSwap(JNIEnv *env,jobject obj)