merge latest update
This commit is contained in:
@@ -473,6 +473,9 @@ void Controller::unlockIfEncrypted(std::function<void(void)> cb, std::function<v
|
||||
zrpc->unlockWallet(password, [=](json reply) {
|
||||
if (isJsonSuccess(reply)) {
|
||||
cb();
|
||||
|
||||
// Refresh the wallet so the encryption status is now in sync.
|
||||
refresh(true);
|
||||
} else {
|
||||
QMessageBox::critical(main, main->tr("Wallet Decryption Failed"),
|
||||
QString::fromStdString(reply["error"].get<json::string_t>()),
|
||||
@@ -539,7 +542,7 @@ void Controller::checkForUpdate(bool silent) {
|
||||
if (!zrpc->haveConnection())
|
||||
return noConnection();
|
||||
|
||||
QUrl cmcURL("https://api.github.com/repos/MyHush/SilentDragonLite/releases");
|
||||
QUrl cmcURL("https://api.github.com/repos/DenioD/SilentDragonLite/releases");
|
||||
|
||||
QNetworkRequest req;
|
||||
req.setUrl(cmcURL);
|
||||
@@ -587,7 +590,7 @@ void Controller::checkForUpdate(bool silent) {
|
||||
.arg(currentVersion.toString()),
|
||||
QMessageBox::Yes, QMessageBox::Cancel);
|
||||
if (ans == QMessageBox::Yes) {
|
||||
QDesktopServices::openUrl(QUrl("https://github.com/MyHush/SilentDragonLite/releases"));
|
||||
QDesktopServices::openUrl(QUrl("https://github.com/DenioD/SilentDragonLite/releases"));
|
||||
} else {
|
||||
// If the user selects cancel, don't bother them again for this version
|
||||
s.setValue("update/lastversion", maxVersion.toString());
|
||||
|
||||
Reference in New Issue
Block a user