From 127e43b952de95c3bdccdec9a0e447e9dd0ffc45 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Tue, 23 Feb 2016 07:10:37 +0100
Subject: [PATCH] Correct custom ID assignments for standard acc.

---
 src/services/standard/standardcategory.cpp | 7 +++++++
 src/services/standard/standardfeed.cpp     | 6 ++++++
 src/services/tt-rss/ttrssserviceroot.cpp   | 2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/services/standard/standardcategory.cpp b/src/services/standard/standardcategory.cpp
index c13833eae..5ed5fa3e0 100755
--- a/src/services/standard/standardcategory.cpp
+++ b/src/services/standard/standardcategory.cpp
@@ -181,6 +181,13 @@ bool StandardCategory::addItself(RootItem *parent) {
 
   setId(query_add.lastInsertId().toInt());
   setCustomId(id());
+
+  // Now set custom ID in the DB.
+  query_add.prepare(QSL("UPDATE Categories SET custom_id = :custom_id WHERE id = :id;"));
+  query_add.bindValue(QSL(":custom_id"), QString::number(customId()));
+  query_add.bindValue(QSL(":id"), id());
+  query_add.exec();
+
   return true;
 }
 
diff --git a/src/services/standard/standardfeed.cpp b/src/services/standard/standardfeed.cpp
index d632f9040..72e94a3f8 100755
--- a/src/services/standard/standardfeed.cpp
+++ b/src/services/standard/standardfeed.cpp
@@ -521,6 +521,12 @@ bool StandardFeed::addItself(RootItem *parent) {
   setId(query_add_feed.lastInsertId().toInt());
   setCustomId(id());
 
+  // Now set custom ID in the DB.
+  query_add_feed.prepare(QSL("UPDATE Feeds SET custom_id = :custom_id WHERE id = :id;"));
+  query_add_feed.bindValue(QSL(":custom_id"), QString::number(customId()));
+  query_add_feed.bindValue(QSL(":id"), id());
+  query_add_feed.exec();
+
   return true;
 }
 
diff --git a/src/services/tt-rss/ttrssserviceroot.cpp b/src/services/tt-rss/ttrssserviceroot.cpp
index 1783546fc..b2aa4dd68 100755
--- a/src/services/tt-rss/ttrssserviceroot.cpp
+++ b/src/services/tt-rss/ttrssserviceroot.cpp
@@ -135,7 +135,7 @@ void TtRssServiceRoot::addNewFeed(const QString &url) {
 }
 
 void TtRssServiceRoot::addNewCategory() {
-  // Do nothing.
+  // NOTE: Do nothing.
 }
 
 bool TtRssServiceRoot::canBeEdited() const {