diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2013-09-14 19:24:27 +0200 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2013-09-14 19:24:27 +0200 |
| commit | 24e9aedc1420d1947f1a7bf5b57ddbab3c5fb2dd (patch) | |
| tree | e8800ed5ed9a693cbb5310c7b57f321c15d28329 /Source/Android | |
| parent | e56071f2be777e0fb9b362c0c3e73144eca4191e (diff) | |
| parent | 4ef5624f1fd46f3d4dd59b98f9c6c485f0dfd566 (diff) | |
Merge branch 'global-user-directory'
Please read https://wiki.dolphin-emu.org/index.php?title=Controlling_the_Global_User_Directory
for documentation about this feature.
Thanks to neobrain and RachelB for their work on this change, and thanks to
everyone who helped test it.
Diffstat (limited to 'Source/Android')
| -rw-r--r-- | Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java index 6703c5710c..07bfaf8a63 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java @@ -64,10 +64,9 @@ public final class DolphinEmulator extends Activity String BaseDir = Environment.getExternalStorageDirectory()+File.separator+"dolphin-emu"; String ConfigDir = BaseDir + File.separator + "Config"; String GCDir = BaseDir + File.separator + "GC"; - String WiiDir = BaseDir + File.separator + "Wii"; // Copy assets if needed - File file = new File(WiiDir + File.separator + "setting-usa.txt"); + File file = new File(GCDir + File.separator + "font_sjis.bin"); if(!file.exists()) { NativeLibrary.CreateUserFolders(); @@ -81,10 +80,6 @@ public final class DolphinEmulator extends Activity CopyAsset("dsp_rom.bin", GCDir + File.separator + "dsp_rom.bin"); CopyAsset("font_ansi.bin", GCDir + File.separator + "font_ansi.bin"); CopyAsset("font_sjis.bin", GCDir + File.separator + "font_sjis.bin"); - CopyAsset("setting-eur.txt", WiiDir + File.separator + "setting-eur.txt"); - CopyAsset("setting-jpn.txt", WiiDir + File.separator + "setting-jpn.txt"); - CopyAsset("setting-kor.txt", WiiDir + File.separator + "setting-kor.txt"); - CopyAsset("setting-usa.txt", WiiDir + File.separator + "setting-usa.txt"); } // Load the configuration keys set in the Dolphin ini and gfx ini files |