DragonX/SilentDragonXLite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Sapling turnstile gaurd

Browse Source
This commit is contained in:
adityapk00
2018-11-18 20:20:58 -08:00
parent 6b10ddf9d8
commit 0907403db2
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/mainwindow.cpp
View File

@@ -194,6 +194,12 @@ void MainWindow::turnstileDoMigration(QString fromAddr) {
if (rpc->getAllZAddresses() == nullptr) if (rpc->getAllZAddresses() == nullptr)
return; return;
// If a migration is already in progress, show the progress dialog instead
if (rpc->getTurnstile()->isMigrationPresent()) {
turnstileProgress();
return;
}
Ui_Turnstile turnstile; Ui_Turnstile turnstile;
QDialog d(this); QDialog d(this);
turnstile.setupUi(&d); turnstile.setupUi(&d);
@@ -481,12 +487,12 @@ void MainWindow::postToZBoard() {
QMap<QString, QString> topics; QMap<QString, QString> topics;
// Insert the main topic automatically // Insert the main topic automatically
topics.insert("#Main_Area", Settings::getZboardAddr()); topics.insert("#Main_Area", Settings::getInstance()->isTestnet() ? Settings::getDonationAddr(true) : Settings::getZboardAddr());
zb.topicsList->addItem(topics.firstKey()); zb.topicsList->addItem(topics.firstKey());
// Then call the API to get topics, and if it returns successfully, then add the rest of the topics // Then call the API to get topics, and if it returns successfully, then add the rest of the topics
rpc->getZboardTopics([&](QMap<QString, QString> topicsMap) { rpc->getZboardTopics([&](QMap<QString, QString> topicsMap) {
for (auto t : topicsMap.keys()) { for (auto t : topicsMap.keys()) {
topics.insert(t, topicsMap[t]); topics.insert(t, Settings::getInstance()->isTestnet() ? Settings::getDonationAddr(true) : topicsMap[t]);
zb.topicsList->addItem(t); zb.topicsList->addItem(t);
} }
}); });