Merge commit '9fed2ea1d136d96be3f07e5e2cb4024426ca9bd5'

airdcpp-web · Jan 19, 2016 · 3e65d6f · 3e65d6f
2 parents fde5e39 + 9fed2ea
commit 3e65d6f
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 21 deletions.
diff --git a/airdcpp-core/airdcpp/FavoriteManager.cpp b/airdcpp-core/airdcpp/FavoriteManager.cpp
@@ -422,21 +422,16 @@ bool FavoriteManager::addFavoriteHub(const FavoriteHubEntryPtr& aEntry) {
 		favoriteHubs.push_back(aEntry);
 	}
 
+	setConnectState(aEntry);
+
 	fire(FavoriteManagerListener::FavoriteHubAdded(), aEntry);
 	save();
 	return true;
 }
 
 void FavoriteManager::onFavoriteHubUpdated(const FavoriteHubEntryPtr& aEntry) {
 	// Update the connect state in case the address was changed
-	auto client = ClientManager::getInstance()->getClient(aEntry->getServer());
-	if (client) {
-		aEntry->setConnectState(client->isConnected() ? FavoriteHubEntry::STATE_CONNECTED : FavoriteHubEntry::STATE_CONNECTING);
-		aEntry->setCurrentHubToken(client->getClientId());
-	} else {
-		aEntry->setCurrentHubToken(0);
-		aEntry->setConnectState(FavoriteHubEntry::STATE_DISCONNECTED);
-	}
+	setConnectState(aEntry);
 
 	save();
 	fire(FavoriteManagerListener::FavoriteHubUpdated(), aEntry);
@@ -1229,6 +1224,17 @@ void FavoriteManager::on(ClientManagerListener::ClientRedirected, const ClientPt
 	onConnectStateChanged(aNewClient, FavoriteHubEntry::STATE_CONNECTING);
 }
 
+void FavoriteManager::setConnectState(const FavoriteHubEntryPtr& aEntry) noexcept {
+	auto client = ClientManager::getInstance()->getClient(aEntry->getServer());
+	if (client) {
+		aEntry->setConnectState(client->isConnected() ? FavoriteHubEntry::STATE_CONNECTED : FavoriteHubEntry::STATE_CONNECTING);
+		aEntry->setCurrentHubToken(client->getClientId());
+	} else {
+		aEntry->setCurrentHubToken(0);
+		aEntry->setConnectState(FavoriteHubEntry::STATE_DISCONNECTED);
+	}
+}
+
 void FavoriteManager::onConnectStateChanged(const ClientPtr& aClient, FavoriteHubEntry::ConnectState aState) noexcept {
 	auto hub = getFavoriteHubEntry(aClient->getHubUrl());
 	if (hub) {

diff --git a/airdcpp-core/airdcpp/FavoriteManager.h b/airdcpp-core/airdcpp/FavoriteManager.h
@@ -226,6 +226,7 @@ class FavoriteManager : public Speaker<FavoriteManagerListener>, private HttpCon
 	bool onHttpFinished(bool fromHttp) noexcept;
 
 	void onConnectStateChanged(const ClientPtr& aClient, FavoriteHubEntry::ConnectState aState) noexcept;
+	void setConnectState(const FavoriteHubEntryPtr& aEntry) noexcept;
 
 	// SettingsManagerListener
 	void on(SettingsManagerListener::Load, SimpleXML& xml) noexcept {

diff --git a/airdcpp-core/airdcpp/TrackableDownloadItem.cpp b/airdcpp-core/airdcpp/TrackableDownloadItem.cpp
@@ -25,6 +25,12 @@
 
 
 namespace dcpp {
+	TrackableDownloadItem::~TrackableDownloadItem() {
+		if (hasDownloads()) {
+			DownloadManager::getInstance()->removeListener(this);
+		}
+	}
+
 	void TrackableDownloadItem::updateState() noexcept {
 		State newState;
 		{

diff --git a/airdcpp-core/airdcpp/TrackableDownloadItem.h b/airdcpp-core/airdcpp/TrackableDownloadItem.h
@@ -32,6 +32,8 @@ namespace dcpp {
 		virtual void onRemovedQueue(const string& aDir, bool aFinished) noexcept;
 		virtual void onAddedQueue(const string& aDir) noexcept;
 
+		~TrackableDownloadItem() noexcept;
+
 		enum State : uint8_t {
 			STATE_DOWNLOAD_PENDING,
 			STATE_DOWNLOADING,

diff --git a/airdcpp-core/airdcpp/Updater.cpp b/airdcpp-core/airdcpp/Updater.cpp
@@ -121,6 +121,8 @@ void Updater::createUpdate() {
 	//add the theme folder
 	auto installer = Util::getParentDir(updaterFilePath) + "installer" + PATH_SEPARATOR;
 	ZipFile::CreateZipFileList(files, installer, Util::emptyString, "^(Themes)$");
+	//Add the web-resources
+	ZipFile::CreateZipFileList(files, installer, Util::emptyString, "^(Web-resources)$");
 
 	ZipFile::CreateZipFile(updaterFilePath + updaterFile, files);
 

diff --git a/airdcpp-core/airdcpp/ViewFileManager.cpp b/airdcpp-core/airdcpp/ViewFileManager.cpp
@@ -125,7 +125,7 @@ namespace dcpp {
 
 	bool ViewFileManager::addFileNotify(const string& aFileName, int64_t aSize, const TTHValue& aTTH, const HintedUser& aUser, bool aIsText) noexcept {
 		try {
-			if (ViewFileManager::getInstance()->addFileThrow(aFileName, aSize, aTTH, aUser, true)) {
+			if (ViewFileManager::getInstance()->addFileThrow(aFileName, aSize, aTTH, aUser, aIsText)) {
 				return true;
 			}
 
@@ -145,21 +145,16 @@ namespace dcpp {
 			return false;
 		}
 
-		auto downloads = file->getDownloads();
-		if (!downloads.empty()) {
-			// It will come back here after being removed from the queue
-			for (const auto& p : downloads) {
-				QueueManager::getInstance()->removeFile(p);
-			}
-		} else {
-			{
-				WLock l(cs);
-				viewFiles.erase(aTTH);
-			}
+		// In case it hasn't been removed yet
+		QueueManager::getInstance()->removeFile(file->getPath());
 
-			fire(ViewFileManagerListener::FileClosed(), file);
+		{
+			WLock l(cs);
+			viewFiles.erase(aTTH);
 		}
 
+		fire(ViewFileManagerListener::FileClosed(), file);
+
 		return true;
 	}