summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2013-02-11 22:06:40 +0400
committerAndrew Dolgov <[email protected]>2013-02-11 22:06:40 +0400
commitda36af7b4216bde92eb77081c39f55206fe64161 (patch)
tree85cce66784e90e199fca20915e97ff4e9accd121 /src
parent0d4bd2f4465aa499de1db3d5ee9beb859fff004e (diff)
fix dual refresh race condition when doing openFeedArticles() in tablet
mode
Diffstat (limited to 'src')
-rw-r--r--src/org/fox/ttrss/ArticlePager.java1
-rw-r--r--src/org/fox/ttrss/HeadlinesFragment.java6
2 files changed, 5 insertions, 2 deletions
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();
}