From 086359c417c646fa5ab070cc50455ba7ff8f7c46 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Peter=20=C3=85strand?= <astrand@cendio.se>
Date: Thu, 23 Jun 2011 08:40:14 +0000
Subject: [PATCH] Call setMenuKey before initContextMenu to avoid uninitialised
 menuKeyCode.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4520 3789f03b-4d11-0410-bbf8-ca57d06f2519
---
 vncviewer/Viewport.cxx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/vncviewer/Viewport.cxx b/vncviewer/Viewport.cxx
index ae9aa106..8d57e9bd 100644
--- a/vncviewer/Viewport.cxx
+++ b/vncviewer/Viewport.cxx
@@ -89,9 +89,8 @@ Viewport::Viewport(int w, int h, const rfb::PixelFormat& serverPF, CConn* cc_)
   // reparenting to the current window works for most cases.
   window()->add(contextMenu);
 
-  initContextMenu();
-
   setMenuKey();
+  initContextMenu();
 
   OptionsDialog::addCallback(handleOptions, this);
 }
-- 
2.39.5