From: Pierre Ossman <ossman@cendio.se>
Date: Thu, 14 Oct 2021 10:42:05 +0000 (+0200)
Subject: Fix closing reconnect dialog logic
X-Git-Tag: v1.12.0~4
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f8bb417d0c7330e8eaeea5fc3739b81330d32ce8;p=tigervnc.git

Fix closing reconnect dialog logic

If you close the reconnect dialog then we should assume that you want to
close things, not that you want to reconnect. Unfortunately FLTK returns
the first choice when closing the dialog, so that needs to be the
"Cancel" alternative.

(cherry picked from commit 7fe85cd4a7ce89b55662fd445b78d50001bad68a)
---

diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx
index d5c2f2bb..c8f5ef3b 100644
--- a/vncviewer/vncviewer.cxx
+++ b/vncviewer/vncviewer.cxx
@@ -211,10 +211,10 @@ static void mainloop(const char* vncserver, network::Socket* sock)
       int ret;
       ret = fl_choice(_("%s\n\n"
                         "Attempt to reconnect?"),
-                      fl_yes, fl_no, 0, exitError);
+                      NULL, fl_yes, fl_no, exitError);
       free(exitError);
       exitError = NULL;
-      if (ret == 0)
+      if (ret == 1)
         continue;
       else
         break;