Browse Source

- Fix folder scanning in program preferences (closes #486712)

adaptive-webui-19844
Christophe Dumez 15 years ago
parent
commit
573a18c20f
  1. 6
      src/options_imp.cpp
  2. 2
      src/preferences.h

6
src/options_imp.cpp

@ -575,7 +575,7 @@ void options_imp::loadOptions(){
checkPreallocateAll->setChecked(Preferences::preAllocateAllFiles()); checkPreallocateAll->setChecked(Preferences::preAllocateAllFiles());
checkAdditionDialog->setChecked(Preferences::useAdditionDialog()); checkAdditionDialog->setChecked(Preferences::useAdditionDialog());
checkStartPaused->setChecked(Preferences::addTorrentsInPause()); checkStartPaused->setChecked(Preferences::addTorrentsInPause());
strValue = Preferences::getSavePath(); strValue = Preferences::getScanDir();
if(strValue.isEmpty()) { if(strValue.isEmpty()) {
// Disable // Disable
checkScanDir->setChecked(false); checkScanDir->setChecked(false);
@ -1275,9 +1275,7 @@ void options_imp::setLocale(QString locale){
// Return scan dir set in options // Return scan dir set in options
QString options_imp::getScanDir() const { QString options_imp::getScanDir() const {
if(checkScanDir->isChecked()){ if(checkScanDir->isChecked()){
QString scanDir = textScanDir->text(); return textScanDir->text().trimmed();
scanDir = scanDir.trimmed();
return scanDir;
}else{ }else{
return QString(); return QString();
} }

2
src/preferences.h

@ -148,7 +148,7 @@ public:
static bool isDirScanEnabled() { static bool isDirScanEnabled() {
QSettings settings("qBittorrent", "qBittorrent"); QSettings settings("qBittorrent", "qBittorrent");
return settings.value(QString::fromUtf8("Preferences/Downloads/ScanDir"), QString()).toString().isEmpty(); return !settings.value(QString::fromUtf8("Preferences/Downloads/ScanDir"), QString()).toString().isEmpty();
} }
static QString getScanDir() { static QString getScanDir() {

Loading…
Cancel
Save