From e3617a55a01d05a7dde37dfc37e662bfd91f42de Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 13 Aug 2013 08:58:50 -0400 Subject: [PATCH] [Android] Clean up the function CopyAsset in DolphinEmulator.java. [streamtype].flush() is called when [streamtype].close() is called. No need to null the references either after calling close(), the garbage collection will take care of it. --- .../src/org/dolphinemu/dolphinemu/DolphinEmulator.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java index fefb13ec14..cf2ad33e4f 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java @@ -33,10 +33,7 @@ public class DolphinEmulator extends Activity out = new FileOutputStream(output); copyFile(in, out); in.close(); - in = null; - out.flush(); out.close(); - out = null; } catch(IOException e) { Log.e("DolphinEmulator", "Failed to copy asset file: " + asset, e); } @@ -78,7 +75,6 @@ public class DolphinEmulator extends Activity super.onCreate(savedInstanceState); if (savedInstanceState == null) { - Intent ListIntent = new Intent(this, GameListActivity.class); startActivityForResult(ListIntent, 1);