[Android] GridFragment: avoid potential NullDereference
Jean-Baptiste Kempf
git at videolan.org
Fri Jul 18 20:46:03 CEST 2014
vlc-ports/android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Jul 18 20:13:41 2014 +0200| [be2d8fea68bcb5c13c402371907855f7a17a5f52] | committer: Jean-Baptiste Kempf
GridFragment: avoid potential NullDereference
> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=be2d8fea68bcb5c13c402371907855f7a17a5f52
---
vlc-android/src/org/videolan/android/ui/GridFragment.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vlc-android/src/org/videolan/android/ui/GridFragment.java b/vlc-android/src/org/videolan/android/ui/GridFragment.java
index 676c167..92b6977 100644
--- a/vlc-android/src/org/videolan/android/ui/GridFragment.java
+++ b/vlc-android/src/org/videolan/android/ui/GridFragment.java
@@ -372,7 +372,7 @@ public class GridFragment extends Fragment {
mGrid = (GridView) rawGridView;
if (mEmptyView != null) {
mGrid.setEmptyView(mEmptyView);
- } else if (mEmptyText != null) {
+ } else if (mEmptyText != null && mStandardEmptyView != null) {
mStandardEmptyView.setText(mEmptyText);
mGrid.setEmptyView(mStandardEmptyView);
}
More information about the Android
mailing list