diff options
Diffstat (limited to 'vdrmanager')
3 files changed, 11 insertions, 3 deletions
diff --git a/vdrmanager/src/de/bjusystems/vdrmanager/data/db/DBAccess.java b/vdrmanager/src/de/bjusystems/vdrmanager/data/db/DBAccess.java index b1f02fc..5d1e10a 100644 --- a/vdrmanager/src/de/bjusystems/vdrmanager/data/db/DBAccess.java +++ b/vdrmanager/src/de/bjusystems/vdrmanager/data/db/DBAccess.java @@ -8,8 +8,6 @@ import android.util.Log; import com.j256.ormlite.android.apptools.OpenHelperManager; import com.j256.ormlite.android.apptools.OrmLiteSqliteOpenHelper; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.dao.DaoManager; import com.j256.ormlite.dao.RuntimeExceptionDao; import com.j256.ormlite.support.ConnectionSource; import com.j256.ormlite.table.TableUtils; diff --git a/vdrmanager/src/de/bjusystems/vdrmanager/gui/EventEpgListActivity.java b/vdrmanager/src/de/bjusystems/vdrmanager/gui/EventEpgListActivity.java index 6fc3646..3256343 100644 --- a/vdrmanager/src/de/bjusystems/vdrmanager/gui/EventEpgListActivity.java +++ b/vdrmanager/src/de/bjusystems/vdrmanager/gui/EventEpgListActivity.java @@ -217,7 +217,7 @@ public class EventEpgListActivity extends BaseTimerEditActivity<Epg> implements return false; } - Date nextForceCache = NEXT_REFRESH.get(currentChannel); + Date nextForceCache = NEXT_REFRESH.get(currentChannel.getId()); if (nextForceCache == null) { return false; diff --git a/vdrmanager/src/de/bjusystems/vdrmanager/gui/VdrManagerActivity.java b/vdrmanager/src/de/bjusystems/vdrmanager/gui/VdrManagerActivity.java index 97721f9..678a54e 100644 --- a/vdrmanager/src/de/bjusystems/vdrmanager/gui/VdrManagerActivity.java +++ b/vdrmanager/src/de/bjusystems/vdrmanager/gui/VdrManagerActivity.java @@ -137,6 +137,9 @@ public class VdrManagerActivity extends SherlockActivity implements break; } case R.id.main_menu_info: { + if(!isFinishing()){ + return true; + } About.show(this); break; } @@ -194,6 +197,13 @@ public class VdrManagerActivity extends SherlockActivity implements Toast.LENGTH_SHORT).show(); ((VdrManagerApp) getApplication()) .finishActivities(); + Intent intent = getIntent(); + overridePendingTransition(0, 0); + intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION); + finish(); + + overridePendingTransition(0, 0); + startActivity(intent); } dialog.dismiss(); } |