Browse Source

- Fix a crash when scanned directory does not exist

adaptive-webui-19844
Christophe Dumez 15 years ago
parent
commit
0485864d38
  1. 12
      src/bittorrent.cpp

12
src/bittorrent.cpp

@ -1044,6 +1044,11 @@ void bittorrent::saveTrackerFile(QString hash) { @@ -1044,6 +1044,11 @@ void bittorrent::saveTrackerFile(QString hash) {
// Enable directory scanning
void bittorrent::enableDirectoryScanning(QString scan_dir) {
if(!scan_dir.isEmpty()) {
QDir newDir(scan_dir);
if(!newDir.exists()) {
qDebug("Scan dir %s does not exist, create it", scan_dir.toUtf8().data());
newDir.mkpath(scan_dir);
}
if(FSWatcher == 0) {
FSMutex = new QMutex();
FSWatcher = new QFileSystemWatcher(QStringList(scan_dir), this);
@ -1051,9 +1056,12 @@ void bittorrent::enableDirectoryScanning(QString scan_dir) { @@ -1051,9 +1056,12 @@ void bittorrent::enableDirectoryScanning(QString scan_dir) {
// Initial scan
scanDirectory(scan_dir);
} else {
QString old_scan_dir = FSWatcher->directories().first();
QString old_scan_dir = "";
if(!FSWatcher->directories().empty())
old_scan_dir = FSWatcher->directories().first();
if(old_scan_dir != scan_dir) {
FSWatcher->removePath(old_scan_dir);
if(!old_scan_dir.isEmpty())
FSWatcher->removePath(old_scan_dir);
FSWatcher->addPath(scan_dir);
// Initial scan
scanDirectory(scan_dir);

Loading…
Cancel
Save