Skip to content

Commit

Permalink
#1489: make sure all encoding options are not reset with state
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@15529 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Apr 8, 2017
1 parent 218e314 commit 6c67110
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/html5/js/Client.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ XpraClient.prototype.init_settings = function(container) {
this.steal = true;
this.remote_logging = true;
this.enabled_encodings = [];
this.supported_encodings = ["jpeg", "png", "rgb", "rgb32"]; //"h264", "vp8+webm", "h264+mp4", "mpeg4+mp4"];
this.start_new_session = null;
this.clipboard_enabled = false;
this.file_transfer = false;
Expand All @@ -75,7 +76,6 @@ XpraClient.prototype.init_state = function(container) {
// some client stuff
this.capabilities = {};
this.RGB_FORMATS = ["RGBX", "RGBA"];
this.supported_encodings = ["jpeg", "png", "rgb", "rgb32"]; //"h264", "vp8+webm", "h264+mp4", "mpeg4+mp4"];
this.disconnect_reason = null;
// audio
this.audio_enabled = false;
Expand Down Expand Up @@ -914,7 +914,7 @@ XpraClient.prototype._make_hello = function() {
"encodings" : this._get_encodings(),
"raw_window_icons" : true,
"encoding.icons.max_size" : [30, 30],
"encodings.core" : this.supported_encodings,
"encodings.core" : this._get_encodings(),
"encodings.rgb_formats" : this.RGB_FORMATS,
"encodings.window-icon" : ["png"],
"encodings.cursor" : ["png"],
Expand Down

0 comments on commit 6c67110

Please sign in to comment.