Revert "guacamole: only flash frame after render"

This reverts commit 7cca58e.
changkun · Nov 8, 2019 · ad688ff · ad688ff
1 parent daa6393
commit ad688ff
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/guacamole/src/protocols/rdp/rdp.c b/guacamole/src/protocols/rdp/rdp.c
@@ -819,10 +819,6 @@ static int guac_rdp_handle_connection(guac_client* client) {
              * excluded from the required wait period of the next frame). */
             last_frame_end = frame_start;
 
-            /* Flush frame */
-            guac_common_display_flush(rdp_client->display);
-            guac_client_end_frame(client);
-            guac_socket_flush(client->socket);
         }
 
         /* Test whether the RDP server is closing the connection */
@@ -839,6 +835,13 @@ static int guac_rdp_handle_connection(guac_client* client) {
             guac_client_abort(client, GUAC_PROTOCOL_STATUS_UPSTREAM_UNAVAILABLE,
                     "Connection closed.");
 
+        /* Flush frame only if successful */
+        else {
+            guac_common_display_flush(rdp_client->display);
+            guac_client_end_frame(client);
+            guac_socket_flush(client->socket);
+        }
+
     }
 
     /* Clean up print job, if active */

diff --git a/guacamole/src/protocols/ssh/terminal.c b/guacamole/src/protocols/ssh/terminal.c
@@ -246,8 +246,13 @@ void* guac_terminal_thread(void* data) {
     while (client->state == GUAC_CLIENT_RUNNING) {
 
         /* Stop rendering if an error occurs */
-        if (guac_terminal_render_frame(terminal, client))
+        if (guac_terminal_render_frame(terminal))
             break;
+
+        /* Signal end of frame */
+        guac_client_end_frame(client);
+        guac_socket_flush(client->socket);
+
     }
 
     /* The client has stopped or an error has occurred */
@@ -769,7 +774,7 @@ static int guac_terminal_wait(guac_terminal* terminal, int msec_timeout) {
 
 }
 
-int guac_terminal_render_frame(guac_terminal* terminal, guac_client* client) {
+int guac_terminal_render_frame(guac_terminal* terminal) {
 
     int wait_result;
 
@@ -800,9 +805,6 @@ int guac_terminal_render_frame(guac_terminal* terminal, guac_client* client) {
         guac_terminal_flush(terminal);
         guac_terminal_unlock(terminal);
 
-        /* Signal end of frame */
-        guac_client_end_frame(client);
-        guac_socket_flush(client->socket);
     }
 
     return 0;

diff --git a/guacamole/src/protocols/ssh/terminal.h b/guacamole/src/protocols/ssh/terminal.h
@@ -512,7 +512,7 @@ void guac_terminal_free(guac_terminal* term);
  * Renders a single frame of terminal data. If data is not yet available,
  * this function will block until data is written.
  */
-int guac_terminal_render_frame(guac_terminal* terminal, guac_client* client);
+int guac_terminal_render_frame(guac_terminal* terminal);
 
 /**
  * Reads from this terminal's STDIN. Input comes from key and mouse events

diff --git a/guacamole/src/protocols/vnc/vnc.c b/guacamole/src/protocols/vnc/vnc.c
@@ -282,16 +282,17 @@ void* guac_vnc_client_thread(void* data) {
              * excluded from the required wait period of the next frame). */
             last_frame_end = frame_start;
 
-            /* Flush frame */
-            guac_common_surface_flush(vnc_client->display->default_surface);
-            guac_client_end_frame(client);
-            guac_socket_flush(client->socket);
         }
 
         /* If an error occurs, log it and fail */
         if (wait_result < 0)
             guac_client_abort(client, GUAC_PROTOCOL_STATUS_UPSTREAM_ERROR, "Connection closed.");
 
+        /* Flush frame */
+        guac_common_surface_flush(vnc_client->display->default_surface);
+        guac_client_end_frame(client);
+        guac_socket_flush(client->socket);
+
     }
 
     /* Kill client and finish connection */