mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-10 16:14:40 +02:00
Code Issues Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
Jeff Mitchell
2011-03-27 19:11:04 -04:00
parent 8d471ae1f1 608b90867a
commit 21eea9f0de
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -1,4 +1,6 @@
Version 0.0.2:
* Don't run a rescan of the local collection if the settings dialog is
closed successfully but the path hasn't changed.
* Don't attempt to connect to unavailable Twitter peers over and over.
* Find Twitter peers if the peer's Got Tomahawk? tweet is not their latest
tweet.

11
src/scanmanager.cpp
View File

@@ -44,6 +44,9 @@ ScanManager::ScanManager( QObject* parent )
s_instance = this;
connect( TomahawkSettings::instance(), SIGNAL( changed() ), SLOT( onSettingsChanged() ) );
if ( TomahawkSettings::instance()->hasScannerPath() )
m_currScannerPath = TomahawkSettings::instance()->scannerPath();
}
@@ -76,8 +79,12 @@ ScanManager::~ScanManager()
void
ScanManager::onSettingsChanged()
{
if ( TomahawkSettings::instance()->hasScannerPath() )
runManualScan( TomahawkSettings::instance()->scannerPath() );
if ( TomahawkSettings::instance()->hasScannerPath() &&
m_currScannerPath != TomahawkSettings::instance()->scannerPath() )
{
m_currScannerPath = TomahawkSettings::instance()->scannerPath();
runManualScan( m_currScannerPath );
}
}

1
src/scanmanager.h
View File

@@ -53,6 +53,7 @@ private:
MusicScanner* m_scanner;
QThread* m_musicScannerThreadController;
QString m_currScannerPath;
};
#endif