From 35cd1f872379e70cf3d18303f7646853e1643f86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9gory=20Oestreicher?= <greg@kamago.net>
Date: Sat, 17 Dec 2016 21:13:56 +0100
Subject: [PATCH] Prevent UI lockup if there's an error when refreshing
articles
---
qml/types/Server.qml | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/qml/types/Server.qml b/qml/types/Server.qml
index 2012fcc..31a98e6 100644
--- a/qml/types/Server.qml
+++ b/qml/types/Server.qml
@@ -116,6 +116,7 @@ Item {
function( err ) {
if ( err !== null ) {
error( qsTr( "Failed to connect to server: " ) + err )
+ cb()
}
else {
WallaBase.syncDeletedArticles( server, { id: serverId, token: accessToken, url: url }, function() { cb(); } )
@@ -140,12 +141,13 @@ Item {
}
function onGetUpdatedArticlesDone( articles, err ) {
+ var ret = new Array;
+
if ( err !== null ) {
error( qsTr( "Failed to download articles: " ) + err )
}
else {
console.debug( "Retrieved " + articles.length + " new/updated articles" )
- var ret = new Array
for ( var i = 0; i < articles.length; ++i ) {
var current = articles[i];
@@ -170,8 +172,9 @@ Item {
}
WallaBase.setServerLastSync( serverId, Math.floor( (new Date).getTime() / 1000 ) )
- articlesDownloaded( ret )
}
+
+ articlesDownloaded( ret )
}
function toggleArticleStar( article, cb ) {