fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-08-07 02:32:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Fixed 'and' and 'or' commands.

Browse Source 
git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@1225 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
rakshasa
2011-05-07 04:57:47 +00:00
parent 1f200e7922
commit 2f485cdf42
2 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/command_ui.cc
+9
View File
@@ -214,7 +214,12 @@ apply_and(rpc::target_type target, const torrent::Object& rawArgs) {
if (!as_boolean(rpc::commands.call_command(itr->as_dict_key().c_str(), itr->as_dict_obj(), target)))
return (int64_t)false;
} else if (itr->is_value()) {
if (!itr->as_value())
return (int64_t)false;
} else {
// TODO: Switch to new versions that only accept the new command syntax.
if (!as_boolean(rpc::parse_command_single(target, itr->as_string())))
return (int64_t)false;
}
@@ -232,6 +237,10 @@ apply_or(rpc::target_type target, const torrent::Object& rawArgs) {
if (as_boolean(rpc::commands.call_command(itr->as_dict_key().c_str(), itr->as_dict_obj(), target)))
return (int64_t)true;
} else if (itr->is_value()) {
if (itr->as_value())
return (int64_t)true;
} else {
if (as_boolean(rpc::parse_command_single(target, itr->as_string())))
return (int64_t)true;