diff options
| author | Mike Harris <atarimike@gmail.com> | 2017-10-04 22:48:27 -0700 |
|---|---|---|
| committer | Mike Harris <atarimike@gmail.com> | 2017-10-15 16:44:56 -0700 |
| commit | bb3f61296e8a436cc2543a9211e96081e07943ab (patch) | |
| tree | 7e21eaa5dac722259072ceb44f610c0e304afc76 /Source/Android/app/src/main/java | |
| parent | 9fb0d9a664066adf494a40812ad98a954fe94ffc (diff) | |
Add a clearEmulation method.
This makes it clear that the Activity is being cleared and removes null as
a valid param. This improves readability (and logging slightly).
Fix spacing between [Tag] and message. This matches the rest of the log
messages.
Diffstat (limited to 'Source/Android/app/src/main/java')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java | 10 | ||||
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java index 614a1076f6..6df525e4bc 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java @@ -391,13 +391,19 @@ public final class NativeLibrary public static void endEmulationActivity() { - Log.verbose("[NativeLibrary]Ending EmulationActivity."); + Log.verbose("[NativeLibrary] Ending EmulationActivity."); sEmulationActivity.exitWithAnimation(); } public static void setEmulationActivity(EmulationActivity emulationActivity) { - Log.verbose("[NativeLibrary]Registering EmulationActivity."); + Log.verbose("[NativeLibrary] Registering EmulationActivity."); sEmulationActivity = emulationActivity; } + + public static void clearEmulationActivity() + { + Log.verbose("[NativeLibrary] Unregistering EmulationActivity."); + sEmulationActivity = null; + } } diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java index 06370c0028..773e0a7880 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java @@ -332,7 +332,7 @@ public final class EmulationActivity extends AppCompatActivity super.onStop(); Log.debug("[EmulationActivity] EmulationActivity stopping."); - NativeLibrary.setEmulationActivity(null); + NativeLibrary.clearEmulationActivity(); } @Override |