linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3052
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Sat 2012-09-15 13:49:25 +0200
message:
  fix a crash when removing queue dirs
modified:
  win32/QueueFrame.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/QueueFrame.cpp'
--- win32/QueueFrame.cpp	2012-09-10 22:14:27 +0000
+++ win32/QueueFrame.cpp	2012-09-15 11:49:25 +0000
@@ -994,9 +994,8 @@
 
 	const auto path = ii->getPath();
 	const auto userList = ii->isSet(QueueItem::FLAG_USER_LIST);
-	const auto isCur = isCurDir(path);
 
-	if(isCur || !SETTING(QUEUEFRAME_SHOW_TREE)) {
+	if(!SETTING(QUEUEFRAME_SHOW_TREE) || isCurDir(path)) {
 		dcassert(files->find(ii) != -1);
 		files->erase(ii);
 	}
@@ -1019,7 +1018,7 @@
 
 	if(directories.count(path) == 0) {
 		removeDirectory(path, userList);
-		if(isCur)
+		if(isCurDir(path))
 			curDir.clear();
 	}