linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3399
committer: eMTee <emtee11@xxxxxxxxx>
branch nick: dcplusplus
timestamp: Thu 2014-02-06 00:29:32 +0100
message:
  Fix crash introduced in r3370
modified:
  win32/TransferView.cpp


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'win32/TransferView.cpp'
--- win32/TransferView.cpp	2013-11-29 17:18:43 +0000
+++ win32/TransferView.cpp	2014-02-05 23:29:32 +0000
@@ -494,6 +494,7 @@
 
 		set<TransferInfo*> files;
 		auto onlyHttp = true;
+		auto onlyDownloads = true;
 		for(auto i: sel) {
 			auto& transfer = transfers->getData(i)->transfer();
 			if(!dynamic_cast<HttpInfo*>(&transfer)) {
@@ -502,6 +503,9 @@
 					files.insert(&transfer);
 				}
 			}
+			if (transfer.type != CONNECTION_TYPE_DOWNLOAD) {
+				onlyDownloads = false;
+			}
 		}
 
 		if(files.size() == 1) {
@@ -528,13 +532,12 @@
 		}
 		menu->appendShellMenu(paths);
 
-		bool isDownload = transfer->type == CONNECTION_TYPE_DOWNLOAD;
 		if(!onlyHttp) {
 			menu->appendSeparator();
-			menu->appendItem(T_("&Force attempt"), [this] { handleForce(); }, dwt::IconPtr(), isDownload);
+			menu->appendItem(T_("&Force attempt"), [this] { handleForce(); }, dwt::IconPtr(), onlyDownloads);
 			menu->appendSeparator();
 
-			menu->appendItem(T_("&Remove file from queue"), [this] { handleRemoveFileFromQueue(); }, dwt::IconPtr(), isDownload);
+			menu->appendItem(T_("&Remove file from queue"), [this] { handleRemoveFileFromQueue(); }, dwt::IconPtr(), onlyDownloads);
 			menu->appendSeparator();
 		}