From da36af7b4216bde92eb77081c39f55206fe64161 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 11 Feb 2013 22:06:40 +0400 Subject: fix dual refresh race condition when doing openFeedArticles() in tablet mode --- src/org/fox/ttrss/ArticlePager.java | 1 + src/org/fox/ttrss/HeadlinesFragment.java | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/org/fox/ttrss/ArticlePager.java b/src/org/fox/ttrss/ArticlePager.java index 9c20a105..f924e8c4 100644 --- a/src/org/fox/ttrss/ArticlePager.java +++ b/src/org/fox/ttrss/ArticlePager.java @@ -169,6 +169,7 @@ public class ArticlePager extends Fragment { } catch (BadParcelableException e) { if (getActivity() != null) { getActivity().finish(); + return; } } diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java index 76cb6bf7..ab3e1cca 100644 --- a/src/org/fox/ttrss/HeadlinesFragment.java +++ b/src/org/fox/ttrss/HeadlinesFragment.java @@ -291,8 +291,10 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, } if (m_articles.size() == 0 || !m_feed.equals(GlobalState.getInstance().m_activeFeed)) { - refresh(false); - GlobalState.getInstance().m_activeFeed = m_feed; + if (m_activity.getSupportFragmentManager().findFragmentByTag(CommonActivity.FRAG_ARTICLE) == null) { + refresh(false); + GlobalState.getInstance().m_activeFeed = m_feed; + } } else { notifyUpdated(); } -- cgit v1.2.3-54-g00ecf