From: Peter Åstrand <astrand@cendio.se>
Date: Thu, 23 Jun 2011 08:40:14 +0000 (+0000)
Subject: Call setMenuKey before initContextMenu to avoid uninitialised
X-Git-Tag: v1.1.90~266
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=086359c417c646fa5ab070cc50455ba7ff8f7c46;p=tigervnc.git

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
---

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);
 }