linuxdcpp-team team mailing list archive
-
linuxdcpp-team team
-
Mailing list archive
-
Message #01146
[Branch ~dcplusplus-team/dcplusplus/trunk] Rev 2149: Fix changeDir being called too soon
------------------------------------------------------------
revno: 2149
committer: eMTee <emtee11@xxxxxxxxx>
branch nick: dcplusplus
timestamp: Sun 2010-05-16 18:33:58 +0200
message:
Fix changeDir being called too soon
modified:
changelog.txt
win32/DirectoryListingFrame.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 'changelog.txt'
--- changelog.txt 2010-05-13 14:03:23 +0000
+++ changelog.txt 2010-05-16 16:33:58 +0000
@@ -21,6 +21,7 @@
* [L#545264] Correct ADC hub counts (emtee)
* Add an "Elapsed" column in finished transfer windows (poy)
* [L#539841] Network settings arrangements (poy)
+* [L#556799] Fix positioning and possible queue problems with downloaded file lists (emtee)
-- 0.761 2010-03-14 --
* [L#533840] Fix crashes with themed menus (poy)
=== modified file 'win32/DirectoryListingFrame.cpp'
--- win32/DirectoryListingFrame.cpp 2010-05-08 16:17:17 +0000
+++ win32/DirectoryListingFrame.cpp 2010-05-16 16:33:58 +0000
@@ -83,12 +83,11 @@
UserIter i = lists.find(aUser);
if(i != lists.end()) {
i->second->speed = aSpeed;
- if(!BOOLSETTING(POPUNDER_FILELIST)) {
- //i->second->activate();
- }
} else {
DirectoryListingFrame* frame = new DirectoryListingFrame(mdiParent, aUser, aSpeed);
frame->loadFile(aFile, aDir);
+ if(!BOOLSETTING(POPUNDER_FILELIST))
+ frame->activate();
}
}
@@ -149,6 +148,8 @@
} else {
DirectoryListingFrame* frame = new DirectoryListingFrame(mdiParent, aUser, aSpeed);
frame->loadXML(txt);
+ if(!BOOLSETTING(POPUNDER_FILELIST))
+ frame->activate();
}
}
@@ -241,8 +242,6 @@
updateTitle();
layout();
- if(!BOOLSETTING(POPUNDER_FILELIST))
- activate();
lists.insert(std::make_pair(aUser, this));
}