From 282285ef78779159c3f9d714fe0c8dd6c6ff195a Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Thu, 20 Sep 2012 09:45:13 +0400
Subject: fix crash when switching activities while downloading offline stuff

---
 .../fox/ttrss/offline/OfflineDownloadService.java    | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/org/fox/ttrss/offline/OfflineDownloadService.java b/src/org/fox/ttrss/offline/OfflineDownloadService.java
index eb9a802e..b2e3ecb0 100644
--- a/src/org/fox/ttrss/offline/OfflineDownloadService.java
+++ b/src/org/fox/ttrss/offline/OfflineDownloadService.java
@@ -464,15 +464,23 @@ public class OfflineDownloadService extends Service {
 
 	@Override
 	public void onStart(Intent intent, int startId) {
-		m_sessionId = intent.getStringExtra("sessionId");
+		try {
+			if (getWritableDb().isDbLockedByCurrentThread() || getWritableDb().isDbLockedByOtherThreads()) {
+				return;
+			}
+			
+			m_sessionId = intent.getStringExtra("sessionId");
 		
-		if (!m_downloadInProgress) {
-			if (m_downloadImages) ImageCacheService.cleanupCache(false);
+			if (!m_downloadInProgress) {
+				if (m_downloadImages) ImageCacheService.cleanupCache(false);
 			
-			updateNotification(R.string.notify_downloading_init);
-			m_downloadInProgress = true;
+				updateNotification(R.string.notify_downloading_init);
+				m_downloadInProgress = true;
 		
-			downloadCategories();
+				downloadCategories();
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
 		}
 	}
 }
-- 
cgit v1.2.3-54-g00ecf