From 4820d05c82ebb8dfca78d8e92db55f69e71e3237 Mon Sep 17 00:00:00 2001

From: Daniel P. Berrangц╘ <berrange@redhat.com>

Date: Tue, 27 Apr 2021 12:22:56 +0100

Subject: [PATCH] src: correctly set display state when cancelling quit request

When the last window is closed we optionally show a confirmation dialog

to check if user wants to quit. If the user cancels, we need to ensure

the display menu state gets set back to checked.

We called g_action_change_state correctly, but a later call to

g_simple_action_set_state used the "visible" variable which was not

correctly reset back to TRUE upon cancel.

Signed-off-by: Daniel P. Berrangц╘ <berrange@redhat.com>

---

 src/virt-viewer-app.c | 6 ++++--

 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/virt-viewer-app.c b/src/virt-viewer-app.c

index de2677c..2687745 100644

--- a/src/virt-viewer-app.c

+++ b/src/virt-viewer-app.c

@@ -2347,10 +2347,12 @@ virt_viewer_app_action_window(VirtViewerApp *self,

             virt_viewer_window_hide(win);

         } else {

             virt_viewer_app_maybe_quit(self, win);

-            if (!priv->quitting)

+            if (!priv->quitting) {

                 /* the last item remains active, doesn't matter if we quit */

+                visible = TRUE;

                 g_action_change_state(G_ACTION(act),

-                                      g_variant_new_boolean(TRUE));

+                                      g_variant_new_boolean(visible));

+            }

         }

     }

--

libgit2 1.1.0