Ecosystem/feather
Ecosystem/feather
1
0
Fork 0
mirror of https://github.com/feather-wallet/feather.git synced 2025-01-22 10:44:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

portable mode: reset wallet dir on start

Browse source
This commit is contained in:
tobtoht 2023-01-26 16:05:54 +01:00
parent 7f07f98f92
commit 15aea81ea4
No known key found for this signature in database
GPG key ID: E45B10DD027D2472
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/MainWindow.cpp
View file

@ -1601,9 +1601,14 @@ void MainWindow::donationNag() {
config()->set(Config::donateBeg, donationCounter); config()->set(Config::donateBeg, donationCounter);
} }
void MainWindow::addToRecentlyOpened(const QString &keysFile) { void MainWindow::addToRecentlyOpened(QString keysFile) {
auto recent = config()->get(Config::recentlyOpenedWallets).toList(); auto recent = config()->get(Config::recentlyOpenedWallets).toList();
if (Utils::isPortableMode()) {
QDir appPath{Utils::applicationPath()};
keysFile = appPath.relativeFilePath(keysFile);
}
if (recent.contains(keysFile)) { if (recent.contains(keysFile)) {
recent.removeOne(keysFile); recent.removeOne(keysFile);
} }
@ -1631,7 +1636,7 @@ void MainWindow::updateRecentlyOpenedMenu() {
const QStringList recentWallets = config()->get(Config::recentlyOpenedWallets).toStringList(); const QStringList recentWallets = config()->get(Config::recentlyOpenedWallets).toStringList();
for (const auto &walletPath : recentWallets) { for (const auto &walletPath : recentWallets) {
QFileInfo fileInfo{walletPath}; QFileInfo fileInfo{walletPath};
ui->menuRecently_open->addAction(fileInfo.fileName(), m_windowManager, std::bind(&WindowManager::tryOpenWallet, m_windowManager, walletPath, "")); ui->menuRecently_open->addAction(fileInfo.fileName(), m_windowManager, std::bind(&WindowManager::tryOpenWallet, m_windowManager, fileInfo.absoluteFilePath(), ""));
} }
ui->menuRecently_open->addSeparator(); ui->menuRecently_open->addSeparator();
ui->menuRecently_open->addAction(m_clearRecentlyOpenAction); ui->menuRecently_open->addAction(m_clearRecentlyOpenAction);

2
src/MainWindow.h
View file

@ -214,7 +214,7 @@ private:
QString getHardwareDevice(); QString getHardwareDevice();
void updateTitle(); void updateTitle();
void donationNag(); void donationNag();
void addToRecentlyOpened(const QString &filename); void addToRecentlyOpened(QString filename);
void updateRecentlyOpenedMenu(); void updateRecentlyOpenedMenu();
void updateWidgetIcons(); void updateWidgetIcons();
bool verifyPassword(bool sensitive = true); bool verifyPassword(bool sensitive = true);

2
src/main.cpp
View file

@ -179,7 +179,7 @@ if (AttachConsole(ATTACH_PARENT_PROCESS)) {
// Setup wallet directory // Setup wallet directory
QString walletDir = config()->get(Config::walletDirectory).toString(); QString walletDir = config()->get(Config::walletDirectory).toString();
if (walletDir.isEmpty()) { if (walletDir.isEmpty() || Utils::isPortableMode()) {
walletDir = Utils::defaultWalletDir(); walletDir = Utils::defaultWalletDir();
config()->set(Config::walletDirectory, walletDir); config()->set(Config::walletDirectory, walletDir);
} }