nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-04-15 05:32:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Athlete Library setting - Avoid warning when there is no change

Browse Source 
Current GC root can be different from athlete library setting
due to GC startup logic and the spurious warning is confusing.
Revert to previous value, not current GC root, if the user chooses to.
Fixes #3903
This commit is contained in:
Alejandro Martinez
2021-06-24 19:16:38 -03:00
parent 32a6089f50
commit 0243aedded
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Gui/ConfigDialog.cpp
View File

@@ -146,7 +146,7 @@ ConfigDialog::ConfigDialog(QDir _home, Context *context) :
measures = new MeasuresConfig(_home, context);
HelpWhatsThis *measuresHelp = new HelpWhatsThis(measures);
measures->setWhatsThis(intervalHelp->getWhatsThisText(HelpWhatsThis::Preferences_Measures));
measures->setWhatsThis(measuresHelp->getWhatsThisText(HelpWhatsThis::Preferences_Measures));
pagesWidget->addWidget(measures);
train = new TrainConfig(_home, context);
@@ -228,7 +228,7 @@ void ConfigDialog::saveClicked()
// did the home directory change?
QString shome = appsettings->value(this, GC_HOMEDIR).toString();
if (shome != general->generalPage->athleteWAS || QFileInfo(shome).absoluteFilePath() != QFileInfo(home.absolutePath()).absolutePath()) {
if (shome != general->generalPage->athleteWAS) {
// are you sure you want to change the location of the athlete library?
// if so we will restart, if not I'll revert to current directory
@@ -263,8 +263,8 @@ void ConfigDialog::saveClicked()
} else {
// revert to current home and let everyone know
appsettings->setValue(GC_HOMEDIR, QFileInfo(home.absolutePath()).absolutePath());
// revert to previous home
appsettings->setValue(GC_HOMEDIR, general->generalPage->athleteWAS);
}
}