------------------------------------------------------------
revno: 2392
committer: poy <p...@123gen.com>
branch nick: trunk
timestamp: Wed 2011-01-12 15:38:02 +0100
message:
Avoid loading unprocessed file lists on exit
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 2011-01-12 14:32:26 +0000
+++ changelog.txt 2011-01-12 14:38:02 +0000
@@ -1,4 +1,5 @@
* Add a dummy serial number to TLS certs to satisfy some parsers (poy)
+* Avoid loading unprocessed file lists on exit (poy)
-- 0.780 2011-01-10 --
* Compiled with C++0x support
=== modified file 'win32/DirectoryListingFrame.cpp'
--- win32/DirectoryListingFrame.cpp 2011-01-10 22:57:50 +0000
+++ win32/DirectoryListingFrame.cpp 2011-01-12 14:38:02 +0000
@@ -103,7 +103,10 @@
frame->activate();
} else {
frame->setDirty(SettingsManager::BOLD_FL);
- frame->onActivate([frame, aDir](bool b) { if(b) frame->loadFile(aDir); });
+ frame->onActivate([frame, aDir](bool b) {
+ if(b && !frame->loaded && !WinUtil::mainWindow->closing())
+ frame->loadFile(aDir);
+ });
}
}
@@ -341,8 +344,6 @@
}
void DirectoryListingFrame::loadFile(const tstring& dir) {
- if(loaded)
- return;
loaded = true;
try {
_______________________________________________
Mailing list: https://launchpad.net/~linuxdcpp-team
Post to : linuxdcpp-team@lists.launchpad.net
Unsubscribe : https://launchpad.net/~linuxdcpp-team
More help : https://help.launchpad.net/ListHelp
