diff --git a/libtransmission/rpc.c b/libtransmission/rpc.c index 2b39edd3c..f9c060046 100644 --- a/libtransmission/rpc.c +++ b/libtransmission/rpc.c @@ -559,7 +559,7 @@ static const char* sessionGet( tr_handle * h, tr_benc * args_in UNUSED, tr_benc * args_out ) { const char * str; - tr_benc * d = tr_bencDictAddDict( args_out, "session", 10 ); + tr_benc * d = args_out; tr_bencDictAddStr( d, "download-dir", tr_sessionGetDownloadDir( h ) ); @@ -586,8 +586,6 @@ sessionGet( tr_handle * h, tr_benc * args_in UNUSED, tr_benc * args_out ) } tr_bencDictAddStr( d, "encryption", str ); - - return NULL; } diff --git a/web/javascript/transmission.js b/web/javascript/transmission.js index 49f225bd1..be0847fa4 100644 --- a/web/javascript/transmission.js +++ b/web/javascript/transmission.js @@ -524,10 +524,10 @@ Transmission.prototype = // pass the new prefs upstream to the RPC server var o = { }; + o[RPC._PeerPort] = parseInt( $('#prefs_form #port')[0].value ); o[RPC._UpSpeedLimit] = parseInt( $('#prefs_form #upload_rate')[0].value ); o[RPC._DownSpeedLimit] = parseInt( $('#prefs_form #download_rate')[0].value ); o[RPC._DownloadDir] = $('#prefs_form #download_location')[0].value; - o[RPC._PeerPort] = $('#prefs_form #port')[0].value; o[RPC._UpSpeedLimited] = $('#prefs_form #limit_upload')[0].checked; o[RPC._DownSpeedLimited] = $('#prefs_form #limit_download')[0].checked; o[RPC._Encryption] = $('#prefs_form #encryption')[0].checked diff --git a/web/javascript/transmission.remote.js b/web/javascript/transmission.remote.js index 459a93c3c..4ddb03ee1 100644 --- a/web/javascript/transmission.remote.js +++ b/web/javascript/transmission.remote.js @@ -91,7 +91,7 @@ TransmissionRemote.prototype = var o = { }; o.method = 'session-get'; this.sendRequest( RPC._Root, $.toJSON(o), function(data) { - var o = data.arguments.session; + var o = data.arguments; Prefs.getClutchPrefs( o ); tr.updatePrefs( o ); }, "json" );