[Android] Prevent infinite loop on some devices

Geoffrey Métais git at videolan.org
Wed Apr 27 17:04:21 CEST 2016


vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Wed Apr 27 17:04:04 2016 +0200| [e0b72ef83cb5d466c096c00855815e8742ef08d0] | committer: Geoffrey Métais

Prevent infinite loop on some devices

> https://code.videolan.org/videolan/vlc-android/commit/e0b72ef83cb5d466c096c00855815e8742ef08d0
---

 vlc-android/src/org/videolan/vlc/gui/MainActivity.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vlc-android/src/org/videolan/vlc/gui/MainActivity.java b/vlc-android/src/org/videolan/vlc/gui/MainActivity.java
index 462df44..e9b327f 100644
--- a/vlc-android/src/org/videolan/vlc/gui/MainActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/MainActivity.java
@@ -911,7 +911,8 @@ public class MainActivity extends AudioPlayerContainerActivity implements Filter
         Fragment current = getSupportFragmentManager()
                 .findFragmentById(R.id.fragment_placeholder);
         while (clazz.isInstance(current)) {
-            fm.popBackStackImmediate();
+            if (!fm.popBackStackImmediate())
+                break;
             current = getSupportFragmentManager()
                     .findFragmentById(R.id.fragment_placeholder);
         }



More information about the Android mailing list