diff options
| author | lado <herrlado@gmail.com> | 2011-11-04 10:16:55 +0100 |
|---|---|---|
| committer | lado <herrlado@gmail.com> | 2011-11-04 10:16:55 +0100 |
| commit | 267999b6fa980635da8736690ff979854fda66dd (patch) | |
| tree | 2e8f43f38bde57d80d300da6d74350fb85568626 | |
| parent | e7bdd1323a035a964e45e001af10aabda1f0abad (diff) | |
| download | vdr-manager-267999b6fa980635da8736690ff979854fda66dd.tar.gz vdr-manager-267999b6fa980635da8736690ff979854fda66dd.tar.bz2 | |
avoid npe
| -rw-r--r-- | vdrmanager/src/de/bjusystems/vdrmanager/gui/BaseEventListActivity.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/vdrmanager/src/de/bjusystems/vdrmanager/gui/BaseEventListActivity.java b/vdrmanager/src/de/bjusystems/vdrmanager/gui/BaseEventListActivity.java index a433e64..463e03d 100644 --- a/vdrmanager/src/de/bjusystems/vdrmanager/gui/BaseEventListActivity.java +++ b/vdrmanager/src/de/bjusystems/vdrmanager/gui/BaseEventListActivity.java @@ -314,6 +314,15 @@ public abstract class BaseEventListActivity<T extends Event> extends if (c != 0) { return c; } + if(item1.getChannelNumber() == null && item2.getChannelNumber() == null){ + return 0; + } + if(item1.getChannelNumber() == null){ + return -1; + } + if(item2.getChannelNumber() == null){ + return 1; + } return Integer.valueOf(item1.getChannelNumber()).compareTo( Integer.valueOf(item2.getChannelNumber())); } |